This commit is contained in:
Administrator 2022-09-06 17:55:17 +03:00
parent 6c93e43459
commit d1973e394d
6 changed files with 11 additions and 19 deletions

View File

@ -5,7 +5,6 @@ services:
nginx: nginx:
image: mathwave/sprint-repo:sprint-infra-nginx-dev image: mathwave/sprint-repo:sprint-infra-nginx-dev
networks: networks:
- net
- battleship-nginx - battleship-nginx
- sprint-nginx - sprint-nginx
- swarmpit-nginx - swarmpit-nginx
@ -45,8 +44,7 @@ services:
image: rabbitmq:3.10.7-management image: rabbitmq:3.10.7-management
ports: ports:
- "5672:5672" - "5672:5672"
networks: - "15672:15672"
- net
environment: environment:
RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV
deploy: deploy:
@ -98,8 +96,7 @@ services:
MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_DEV MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_DEV
ports: ports:
- "9000:9000" - "9000:9000"
networks: - "9001:9001"
- net
deploy: deploy:
mode: replicated mode: replicated
placement: placement:

View File

@ -5,7 +5,6 @@ services:
nginx: nginx:
image: mathwave/sprint-repo:sprint-infra-nginx-prod image: mathwave/sprint-repo:sprint-infra-nginx-prod
networks: networks:
- net
- battleship-nginx - battleship-nginx
- sprint-nginx - sprint-nginx
- swarmpit-nginx - swarmpit-nginx
@ -45,8 +44,7 @@ services:
image: rabbitmq:3.10.7-management image: rabbitmq:3.10.7-management
ports: ports:
- "5672:5672" - "5672:5672"
networks: - "15672:15672"
- net
environment: environment:
RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_PROD RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_PROD
deploy: deploy:
@ -98,8 +96,7 @@ services:
MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_PROD MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_PROD
ports: ports:
- "9000:9000" - "9000:9000"
networks: - "9001:9001"
- net
deploy: deploy:
mode: replicated mode: replicated
placement: placement:

View File

@ -15,7 +15,6 @@ services:
retries: 3 retries: 3
networks: networks:
- net - net
- swarmpit-nginx
ports: ports:
- "888:8080" - "888:8080"
deploy: deploy:

View File

@ -15,7 +15,6 @@ services:
retries: 3 retries: 3
networks: networks:
- net - net
- swarmpit-nginx
ports: ports:
- "888:8080" - "888:8080"
deploy: deploy:

View File

@ -24,7 +24,7 @@ http {
add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
location / { location / {
proxy_pass http://app:8080/; proxy_pass http://develop.sprinthub.ru:888/;
} }
} }
@ -43,7 +43,7 @@ http {
add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
location / { location / {
proxy_pass http://rabbitmq:15672/; proxy_pass http://develop.sprinthub.ru:15672/;
} }
} }
@ -62,7 +62,7 @@ http {
add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
location / { location / {
proxy_pass http://minio:9001/; proxy_pass http://develop.sprinthub.ru:9001/;
} }
} }

View File

@ -6,7 +6,7 @@ http {
server { server {
listen 80; listen 80;
server_name gitlab.sprinthub.ru; server_name gitlab.sprinthub.ru;
location / { location / {
proxy_pass http://dev.sprinthub.ru:1234/; proxy_pass http://dev.sprinthub.ru:1234/;
} }
@ -52,7 +52,7 @@ http {
add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
location / { location / {
proxy_pass http://app:8080/; proxy_pass http://dev.sprinthub.ru:888/;
} }
} }
@ -71,7 +71,7 @@ http {
add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
location / { location / {
proxy_pass http://rabbitmq:15672/; proxy_pass http://dev.sprinthub.ru:15672/;
} }
} }
@ -90,7 +90,7 @@ http {
add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always; add_header Content-Security-Policy "default-src * data: 'unsafe-eval' 'unsafe-inline'" always;
location / { location / {
proxy_pass http://minio:9001/; proxy_pass http://dev.sprinthub.ru:9001/;
} }
} }