diff --git a/Dockerfile b/Dockerfile index af627e6902d37a6717cb9d034fc11267d269746c..481f82cf4191697649ff60c77db4c226472eb110 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/docker-compose.yaml b/docker-compose.yaml index 4872fa4f4bf527ebbafd10f1fc61d43118b3b48d..058c2ab473d41cb715aadafa43429874e6f6c403 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -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: diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 6aa2a745d106bae0e5c364f0739a2ff6b1f0d38a..8338e1f3b3dde78bb81b38d580c2310fc97c9a8f 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -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 diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index de25fd6f1c4f21b14645df3e353f58e62b991f6f..1dd3bf2a148bac79627e3496c8969ae99b538fa1 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -21,6 +21,6 @@ server { } location /javascript/ { - alias /srv/javascript/; + alias /usr/share/javascript/; } }