This commit is contained in:
Administrator 2022-09-04 00:30:28 +03:00
parent 1962a9fc2b
commit ba60154492
3 changed files with 11 additions and 12 deletions

View File

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

View File

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

View File

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