Skip to content
Snippets Groups Projects
Verified Commit ca46876a authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Move javascript to nginx service.

parent 43da353e
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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:
......@@ -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
......@@ -21,6 +21,6 @@ server {
}
location /javascript/ {
alias /srv/javascript/;
alias /usr/share/javascript/;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment