self/infra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitlab

Browse Source
This commit is contained in:
Administrator 2022-09-04 09:45:51 +03:00
parent 20787161ac
commit 34838afbb3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.deploy-gitlab/deploy-prod.yml → .deploy-gitlab/deploy-prod.yaml
View File

@ -7,8 +7,6 @@ services:
GITLAB_OMNIBUS_CONFIG: | GITLAB_OMNIBUS_CONFIG: |
external_url 'http://gitlab.sprinthub.ru' external_url 'http://gitlab.sprinthub.ru'
# Add any other gitlab.rb configuration here, each on its own line # Add any other gitlab.rb configuration here, each on its own line
ports:
- 1234:80
volumes: volumes:
- /root/gitlab/data:/var/opt/gitlab - /root/gitlab/data:/var/opt/gitlab
- /root/gitlab/logs:/var/log/gitlab - /root/gitlab/logs:/var/log/gitlab

2
.gitlab-ci.yml
View File

@ -7,6 +7,7 @@ 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
@ -46,3 +47,4 @@ 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

2
nginx/nginx-prod/nginx-prod.conf
View File

@ -8,7 +8,7 @@ http {
server_name gitlab.sprinthub.ru; server_name gitlab.sprinthub.ru;
location / { location / {
proxy_pass http://dev.sprinthub.ru:1234/; proxy_pass http://gitlab:80/;
} }
} }