prod

.deploy-infra/deploy-prod.yaml

@@ -5,15 +5,14 @@ services:
     image: mathwave/sprint-repo:sprint-infra-nginx-prod
     ports:
       - "80:80"
-      - "443:443"
     networks:
+      - net
       - battleship-nginx
       - sprint-nginx
       - swarmpit-nginx
-      - gitlab-nginx
     deploy:
       mode: replicated
-      replicas: 2
+      replicas: 1
       restart_policy:
         condition: any
       placement:
@@ -44,7 +43,8 @@ services:
     image: rabbitmq:3.7.9-management
     ports:
       - "5672:5672"
-      - "15672:15672"
+    networks:
+      - net
     environment:
       RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_PROD
     deploy:
@@ -96,7 +96,8 @@ services:
       MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_PROD
     ports:
       - "9000:9000"
-      - "9001:9001"
+    networks:
+      - net
     deploy:
       mode: replicated
       placement:
@@ -112,11 +113,11 @@ volumes:
     driver: local
 
 networks:
+  net:
+    driver: overlay
   battleship-nginx:
     external: true
   sprint-nginx:
     external: true
   swarmpit-nginx:
-    external: true
-  gitlab-nginx:
     external: true

.gitlab-ci.yml

@@ -7,7 +7,6 @@ stages:
   before_script:
     - docker login -u mathwave -p $DOCKERHUB_PASSWORD
     - docker network create -d overlay --attachable swarmpit-nginx || true
-    - docker network create -d overlay --attachable gitlab-nginx || true
 
 build:
   stage: build
@@ -47,4 +46,3 @@ deploy-prod:
   script:
     - docker stack deploy -c ./.deploy-swarmpit/deploy-prod.yaml swarmpit
     - docker stack deploy -c ./.deploy-infra/deploy-prod.yaml infra
-    - docker stack deploy -c ./.deploy-gitlab/deploy-prod.yaml gitlab

nginx/nginx-prod/nginx-prod.conf

@@ -8,7 +8,7 @@ http {
         server_name gitlab.sprinthub.ru;
 
         location / {
-            proxy_pass http://gitlab:80/;
+            proxy_pass http://dev.sprinthub.ru:1234/;
         }
     }
 
@@ -26,7 +26,7 @@ http {
         server_name rabbitmq.sprinthub.ru;
 
         location / {
-            proxy_pass http://dev.sprinthub.ru:15672/;
+            proxy_pass http://rabbitmq:15672/;
         }
     }
 
@@ -35,7 +35,7 @@ http {
         server_name minio.sprinthub.ru;
 
         location / {
-            proxy_pass http://dev.sprinthub.ru:9001/;
+            proxy_pass http://minio:9001/;
         }
     }