diff --git a/.deploy-gitlab/deploy-prod.yml b/.deploy-gitlab/deploy-prod.yml index e69de29..0576994 100644 --- a/.deploy-gitlab/deploy-prod.yml +++ b/.deploy-gitlab/deploy-prod.yml @@ -0,0 +1,27 @@ +version: '3.3' + +services: + gitlab: + image: gitlab/gitlab-ee:15.2.2-ee.0 + environment: + GITLAB_OMNIBUS_CONFIG: | + external_url 'http://gitlab.sprinthub.ru' + # Add any other gitlab.rb configuration here, each on its own line + ports: + - 1234:80 + volumes: + - /root/gitlab/data:/var/opt/gitlab + - /root/gitlab/logs:/var/log/gitlab + - /root/gitlab/config:/etc/gitlab + networks: + - default + - gitlab-nginx + deploy: + placement: + constraints: + - node.role == manager +networks: + default: + driver: overlay + gitlab-nginx: + external: true diff --git a/.deploy-infra/deploy-dev.yaml b/.deploy-infra/deploy-dev.yaml index 23a2c6c..1536b05 100644 --- a/.deploy-infra/deploy-dev.yaml +++ b/.deploy-infra/deploy-dev.yaml @@ -7,6 +7,7 @@ services: - "80:80" - "443:443" networks: + - net - battleship-nginx - sprint-nginx - swarmpit-nginx @@ -40,10 +41,12 @@ services: order: start-first rabbitmq: - image: rabbitmq:3.7.9-management + image: rabbitmq:3.10.7-management ports: - "5672:5672" - "15672:15672" + networks: + - net environment: RABBITMQ_DEFAULT_PASS: $RABBITMQ_PASSWORD_DEV deploy: @@ -95,7 +98,8 @@ services: MINIO_ROOT_PASSWORD: $MINIO_PASSWORD_DEV ports: - "9000:9000" - - "9001:9001" + networks: + - net deploy: mode: replicated placement: @@ -111,6 +115,8 @@ volumes: driver: local networks: + net: + driver: overlay battleship-nginx: external: true sprint-nginx: diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index 38d93a1..40dff22 100644 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -10,6 +10,7 @@ services: - battleship-nginx - sprint-nginx - swarmpit-nginx + - gitlab-nginx deploy: mode: replicated replicas: 2 @@ -116,4 +117,6 @@ networks: sprint-nginx: external: true swarmpit-nginx: + external: true + gitlab-nginx: external: true \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 638a84d..88316af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ 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 @@ -45,4 +46,5 @@ deploy-prod: when: manual script: - docker stack deploy -c ./.deploy-swarmpit/deploy-prod.yaml swarmpit - - docker stack deploy -c ./.deploy-infra/deploy-prod.yaml infra \ No newline at end of file + - docker stack deploy -c ./.deploy-infra/deploy-prod.yaml infra + - docker stack deploy -c ./.deploy-gitlab/deploy-prod.yaml gitlab \ No newline at end of file diff --git a/nginx/nginx-dev/nginx-dev.conf b/nginx/nginx-dev/nginx-dev.conf index d996e71..425eb2b 100644 --- a/nginx/nginx-dev/nginx-dev.conf +++ b/nginx/nginx-dev/nginx-dev.conf @@ -17,7 +17,7 @@ http { server_name rabbitmq.develop.sprinthub.ru; location / { - proxy_pass http://dev.develop.sprinthub.ru:15672/; + proxy_pass http://rabbitmq:15672/; } } @@ -26,7 +26,7 @@ http { server_name minio.develop.sprinthub.ru; location / { - proxy_pass http://dev.develop.sprinthub.ru:9001/; + proxy_pass http://minio:9001/; } } diff --git a/nginx/nginx-prod/nginx-prod.conf b/nginx/nginx-prod/nginx-prod.conf index 93de7e4..caf117a 100644 --- a/nginx/nginx-prod/nginx-prod.conf +++ b/nginx/nginx-prod/nginx-prod.conf @@ -8,7 +8,7 @@ http { server_name gitlab.sprinthub.ru; location / { - proxy_pass http://dev.sprinthub.ru:1234/; + proxy_pass http://gitlab:80/; } }