Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
ca46876a
Verified
Commit
ca46876a
authored
5 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Patches
Plain Diff
Move javascript to nginx service.
parent
43da353e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Dockerfile
+2
-2
2 additions, 2 deletions
Dockerfile
docker-compose.yaml
+0
-3
0 additions, 3 deletions
docker-compose.yaml
docker/nginx/Dockerfile
+2
-1
2 additions, 1 deletion
docker/nginx/Dockerfile
docker/nginx/nginx.conf
+1
-1
1 addition, 1 deletion
docker/nginx/nginx.conf
with
5 additions
and
7 deletions
Dockerfile
+
2
−
2
View file @
ca46876a
...
...
@@ -22,14 +22,14 @@ RUN poetry build && /srv/venv/bin/pip install dist/*.whl
WORKDIR
/usr/src/app/BiscuIT-ng
RUN
apt
install
-y
libjs-bootstrap4
fonts-font-awesome libjs-jquery libjs-popper.js libjs-jquery-datatables
RUN
apt
install
-y
libjs-bootstrap4
RUN
mkdir
/srv/media /srv/static /var/backups/biscuit
ENV
BISCUIT_static.root=/srv/static
ENV
BISCUIT_media.root=/srv/media
RUN
/srv/venv/bin/python manage.py collectstatic
--no-input
--clear
RUN
/srv/venv/bin/python manage.py collectstatic
--no-input
RUN
/srv/venv/bin/python manage.py compilemessages
RUN
/srv/venv/bin/pip
install
gunicorn
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yaml
+
0
−
3
View file @
ca46876a
...
...
@@ -17,7 +17,6 @@ services:
-
biscuit_media:/srv/media
-
biscuit_static:/srv/static
-
biscuit_backups:/var/backups/biscuit
-
javascript:/usr/share/javascript
environment
:
-
BISCUIT_secret_key=DoNotUseInProduction
-
BISCUIT_http.allowed_hosts="['*']"
...
...
@@ -32,7 +31,6 @@ services:
volumes
:
-
biscuit_media:/srv/media
-
biscuit_static:/srv/static
-
javascript:/srv/javascript
ports
:
-
8080:80
depends_on
:
...
...
@@ -43,4 +41,3 @@ volumes:
biscuit_media
:
biscuit_static
:
biscuit_backups
:
javascript
:
This diff is collapsed.
Click to expand it.
docker/nginx/Dockerfile
+
2
−
1
View file @
ca46876a
...
...
@@ -3,6 +3,7 @@ FROM nginx
RUN
rm
/etc/nginx/conf.d/default.conf
COPY
nginx.conf /etc/nginx/conf.d
RUN
apt
install
-y
libjs-bootstrap4 fonts-font-awesome libjs-jquery libjs-popper.js libjs-jquery-datatables
RUN
mkdir
/srv/media
RUN
mkdir
/srv/static
RUN
mkdir
/srv/javascript
This diff is collapsed.
Click to expand it.
docker/nginx/nginx.conf
+
1
−
1
View file @
ca46876a
...
...
@@ -21,6 +21,6 @@ server {
}
location
/javascript/
{
alias
/sr
v
/javascript/
;
alias
/
u
sr
/share
/javascript/
;
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment