gitlab

.deploy/deploy-dev.yaml

@@ -1,9 +1,7 @@
 version: "3.6"
 services:
   nginx:
-    image: nginx
+    image: sprint-infra-nginx
-    volumes:
-      - ../nginx/nginx-dev.conf:/etc/nginx/nginx.conf
     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

.deploy/deploy-prod.yaml

@@ -2,9 +2,7 @@ version: "3.6"
 
 services:
   nginx:
-    image: nginx
+    image: sprint-infra-nginx
-    volumes:
-      - ../nginx/nginx-prod.conf:/etc/nginx/nginx.conf
     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:

.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

nginx/nginx-dev/Dockerfile

@@ -0,0 +1,2 @@
+FROM nginx
+COPY ./nginx-dev.conf /etc/nginx/nginx.conf

nginx/nginx-prod/Dockerfile

@@ -0,0 +1,2 @@
+FROM nginx
+COPY ./nginx-prod.conf /etc/nginx/nginx.conf