Browse Source

Move nginx configs to docker directory

pull/1686/head
Hironsan 2 years ago
parent
commit
2f6af23a24
5 changed files with 4 additions and 6 deletions
  1. 4
      .dockerignore
  2. 2
      docker-compose.prod.yml
  3. 4
      docker/Dockerfile.nginx
  4. 0
      docker/nginx/default.conf
  5. 0
      docker/nginx/nginx.conf

4
.dockerignore

@ -1,11 +1,9 @@
* *
!backend/ !backend/
!frontend/ !frontend/
!nginx/
!docker/nginx/
!tests/ !tests/
!tools/ !tools/
!.coveragerc
!.flake8
!Dockerfile !Dockerfile
!Pipfile.lock !Pipfile.lock
!Pipfile !Pipfile

2
docker-compose.prod.yml

@ -56,7 +56,7 @@ services:
nginx: nginx:
build: build:
context: . context: .
dockerfile: nginx/Dockerfile
dockerfile: docker/Dockerfile.nginx
environment: environment:
API_URL: "http://backend:8000" API_URL: "http://backend:8000"
GOOGLE_TRACKING_ID: "" GOOGLE_TRACKING_ID: ""

nginx/Dockerfile → docker/Dockerfile.nginx

@ -16,8 +16,8 @@ RUN addgroup -g 61000 doccano \
&& adduser -G doccano -S doccano -u 61000 && adduser -G doccano -S doccano -u 61000
COPY --chown=doccano:doccano --from=frontend-builder /app/dist /var/www/html COPY --chown=doccano:doccano --from=frontend-builder /app/dist /var/www/html
COPY nginx/nginx.conf /etc/nginx/nginx.conf
COPY nginx/default.conf /etc/nginx/conf.d/default.conf
COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
COPY docker/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 \

nginx/default.conf → docker/nginx/default.conf

nginx/nginx.conf → docker/nginx/nginx.conf

Loading…
Cancel
Save