From 2f6af23a2488188c500963a5feaa95c8590521fe Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Tue, 15 Feb 2022 13:49:12 +0900
Subject: [PATCH] Move nginx configs to docker directory

---
 .dockerignore                               | 4 +---
 docker-compose.prod.yml                     | 2 +-
 nginx/Dockerfile => docker/Dockerfile.nginx | 4 ++--
 {nginx => docker/nginx}/default.conf        | 0
 {nginx => docker/nginx}/nginx.conf          | 0
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename nginx/Dockerfile => docker/Dockerfile.nginx (83%)
 rename {nginx => docker/nginx}/default.conf (100%)
 rename {nginx => docker/nginx}/nginx.conf (100%)

diff --git a/.dockerignore b/.dockerignore
index 3fba7fcb..87442b43 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,11 +1,9 @@
 *
 !backend/
 !frontend/
-!nginx/
+!docker/nginx/
 !tests/
 !tools/
-!.coveragerc
-!.flake8
 !Dockerfile
 !Pipfile.lock
 !Pipfile
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 38442200..09e098a8 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -56,7 +56,7 @@ services:
   nginx:
     build:
       context: .
-      dockerfile: nginx/Dockerfile
+      dockerfile: docker/Dockerfile.nginx
     environment:
       API_URL: "http://backend:8000"
       GOOGLE_TRACKING_ID: ""
diff --git a/nginx/Dockerfile b/docker/Dockerfile.nginx
similarity index 83%
rename from nginx/Dockerfile
rename to docker/Dockerfile.nginx
index 4a138908..9017c0fc 100644
--- a/nginx/Dockerfile
+++ b/docker/Dockerfile.nginx
@@ -16,8 +16,8 @@ RUN addgroup -g 61000 doccano \
   && adduser -G doccano -S doccano -u 61000
 
 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 \
   && chmod -R g+w /var/cache/nginx \
diff --git a/nginx/default.conf b/docker/nginx/default.conf
similarity index 100%
rename from nginx/default.conf
rename to docker/nginx/default.conf
diff --git a/nginx/nginx.conf b/docker/nginx/nginx.conf
similarity index 100%
rename from nginx/nginx.conf
rename to docker/nginx/nginx.conf