diff --git a/.deploy-gitlab/deploy-prod.yml b/.deploy-gitlab/deploy-prod.yaml similarity index 95% rename from .deploy-gitlab/deploy-prod.yml rename to .deploy-gitlab/deploy-prod.yaml index 0576994..590dd1f 100644 --- a/.deploy-gitlab/deploy-prod.yml +++ b/.deploy-gitlab/deploy-prod.yaml @@ -7,8 +7,6 @@ services: 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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c4cad4..17c7d9e 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 @@ -46,3 +47,4 @@ 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 diff --git a/nginx/nginx-prod/nginx-prod.conf b/nginx/nginx-prod/nginx-prod.conf index fec94dd..dc3bcb9 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/; } }