From 2ddfd02b3a12fddbe9c7df2488fb7d19c9008ef2 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: Thu, 18 Aug 2022 12:49:46 +0300
Subject: [PATCH] gitlab

---
 .deploy/deploy-dev.yaml                | 5 +----
 .deploy/deploy-prod.yaml               | 5 +----
 .gitlab-ci.yml                         | 2 ++
 nginx/nginx-dev/Dockerfile             | 2 ++
 nginx/{ => nginx-dev}/nginx-dev.conf   | 0
 nginx/nginx-prod/Dockerfile            | 2 ++
 nginx/{ => nginx-prod}/nginx-prod.conf | 0
 7 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 nginx/nginx-dev/Dockerfile
 rename nginx/{ => nginx-dev}/nginx-dev.conf (100%)
 create mode 100644 nginx/nginx-prod/Dockerfile
 rename nginx/{ => nginx-prod}/nginx-prod.conf (100%)

diff --git a/.deploy/deploy-dev.yaml b/.deploy/deploy-dev.yaml
index 6fd3b50..d82004c 100644
--- a/.deploy/deploy-dev.yaml
+++ b/.deploy/deploy-dev.yaml
@@ -1,9 +1,7 @@
 version: "3.6"
 services:
   nginx:
-    image: nginx
-    volumes:
-      - ../nginx/nginx-dev.conf:/etc/nginx/nginx.conf
+    image: sprint-infra-nginx
     ports:
       - "80:80"
     deploy:
@@ -64,7 +62,6 @@ services:
   gitlab-runner:
     image: mathwave/sprint-repo:gitlab-runner
     volumes:
-      - /etc/builds:/etc/builds
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
       GITLAB_REGISTRATION_TOKEN: $GITLAB_REGISTRATION_TOKEN
diff --git a/.deploy/deploy-prod.yaml b/.deploy/deploy-prod.yaml
index 6a9f417..c4178e7 100644
--- a/.deploy/deploy-prod.yaml
+++ b/.deploy/deploy-prod.yaml
@@ -2,9 +2,7 @@ version: "3.6"
 
 services:
   nginx:
-    image: nginx
-    volumes:
-      - ../nginx/nginx-prod.conf:/etc/nginx/nginx.conf
+    image: sprint-infra-nginx
     ports:
       - "80:80"
     deploy:
@@ -66,7 +64,6 @@ services:
     image: mathwave/sprint-repo:gitlab-runner
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - /home:/home
     deploy:
       mode: replicated
       placement:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 769de96..9457b98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ deploy-dev:
       when: on_success
     - when: manual
   script:
+    - docker build -t sprint-infra-nginx nginx/nginx-dev
     - docker stack deploy -c ./.deploy/deploy-dev.yaml infra
 
 deploy-prod:
@@ -21,4 +22,5 @@ deploy-prod:
     - master
   when: manual
   script:
+    - docker build -t sprint-infra-nginx nginx/nginx-prod
     - docker stack deploy -c ./.deploy/deploy-prod.yaml infra
\ No newline at end of file
diff --git a/nginx/nginx-dev/Dockerfile b/nginx/nginx-dev/Dockerfile
new file mode 100644
index 0000000..852de58
--- /dev/null
+++ b/nginx/nginx-dev/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx
+COPY ./nginx-dev.conf /etc/nginx/nginx.conf
\ No newline at end of file
diff --git a/nginx/nginx-dev.conf b/nginx/nginx-dev/nginx-dev.conf
similarity index 100%
rename from nginx/nginx-dev.conf
rename to nginx/nginx-dev/nginx-dev.conf
diff --git a/nginx/nginx-prod/Dockerfile b/nginx/nginx-prod/Dockerfile
new file mode 100644
index 0000000..28058c7
--- /dev/null
+++ b/nginx/nginx-prod/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx
+COPY ./nginx-prod.conf /etc/nginx/nginx.conf
\ No newline at end of file
diff --git a/nginx/nginx-prod.conf b/nginx/nginx-prod/nginx-prod.conf
similarity index 100%
rename from nginx/nginx-prod.conf
rename to nginx/nginx-prod/nginx-prod.conf