Browse Source

Merge pull request #1391 from doccano/fix/#1388

Update Dockerfiles
pull/1396/head
Hiroki Nakayama 3 years ago
committed by GitHub
parent
commit
941ef22d3f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
  1. 3
      .dockerignore
  2. 3
      backend/Dockerfile.prod
  3. 3
      nginx/Dockerfile

3
.dockerignore

@ -17,6 +17,9 @@ backend/**/webpack-stats.json
backend/**/*.sqlite3 backend/**/*.sqlite3
backend/**/.env backend/**/.env
backend/**/junitxml/ backend/**/junitxml/
backend/media
backend/filepond-temp-uploads
backend/stored_uploads
backend/**/staticfiles/ backend/**/staticfiles/
backend/**/venv/ backend/**/venv/
backend/**/__pycache__/ backend/**/__pycache__/

3
backend/Dockerfile.prod

@ -29,9 +29,8 @@ RUN apt-get update \
COPY --chown=doccano:doccano tools/ /opt/bin/ COPY --chown=doccano:doccano tools/ /opt/bin/
RUN mkdir -p /backend/staticfiles \ RUN mkdir -p /backend/staticfiles \
&& chown -R doccano:doccano /backend/staticfiles \
&& mkdir -p /backend/client/dist/static \ && mkdir -p /backend/client/dist/static \
&& chown -R doccano:doccano /backend/client/dist/static \
&& mkdir -p /backend/media \
&& chown -R doccano:doccano /backend/ && chown -R doccano:doccano /backend/
USER doccano:doccano USER doccano:doccano

3
nginx/Dockerfile

@ -19,7 +19,8 @@ COPY nginx/nginx.conf /etc/nginx/nginx.conf
COPY nginx/default.conf /etc/nginx/conf.d/default.conf COPY nginx/default.conf /etc/nginx/conf.d/default.conf
RUN chown -R doccano:doccano /var/cache/nginx \ RUN chown -R doccano:doccano /var/cache/nginx \
&& chmod -R g+w /var/cache/nginx
&& chmod -R g+w /var/cache/nginx \
&& chown -R doccano:doccano /media
EXPOSE 8080 EXPOSE 8080

Loading…
Cancel
Save