From 11759c53d938d884c7161f2d05a7f9e7e177cdf2 Mon Sep 17 00:00:00 2001 From: qq Date: Thu, 25 Aug 2022 12:17:34 +0800 Subject: [PATCH] gitlab docker --- normal/gitlab/docker-compose.yml | 13 +++++++++---- use_ssl/gitlab/docker-compose.yml | 15 ++++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/normal/gitlab/docker-compose.yml b/normal/gitlab/docker-compose.yml index 5e8bfff..481d2be 100644 --- a/normal/gitlab/docker-compose.yml +++ b/normal/gitlab/docker-compose.yml @@ -3,15 +3,20 @@ services: gitlab: image: 'gitlab/gitlab-ce' restart: unless-stopped - hostname: 'git.motoko.site' #记得修改这里 + hostname: 'git.site' #璁板緱淇敼杩欓噷 container_name: gitlab environment: - VIRTUAL_HOST: example.test.com + VIRTUAL_HOST: git.site TZ: 'Asia/Shanghai' GITLAB_OMNIBUS_CONFIG: | - external_url 'http://example.test.com' #记得修改这里 + external_url 'http://git.site' #璁板緱淇敼杩欓噷 gitlab_rails['time_zone'] = 'Asia/Shanghai' volumes: - /srv/gitlab/config:/etc/gitlab - /srv/gitlab/logs:/var/log/gitlab - - /srv/gitlab/data:/var/opt/gitlab \ No newline at end of file + - /srv/gitlab/data:/var/opt/gitlab + +networks: + default: + external: + name: nginx-proxy \ No newline at end of file diff --git a/use_ssl/gitlab/docker-compose.yml b/use_ssl/gitlab/docker-compose.yml index 9cb03b5..f91c194 100644 --- a/use_ssl/gitlab/docker-compose.yml +++ b/use_ssl/gitlab/docker-compose.yml @@ -3,17 +3,22 @@ services: gitlab: image: 'gitlab/gitlab-ce' restart: unless-stopped - hostname: 'git.motoko.site' #记得修改这里 + hostname: 'git.site' #璁板緱淇敼杩欓噷 container_name: gitlab environment: - VIRTUAL_HOST: example.test.com - LETSENCRYPT_HOST: example.test.com + VIRTUAL_HOST: git.site + LETSENCRYPT_HOST: git.site DEFAULT_EMAIL: xxx@gmail.com TZ: 'Asia/Shanghai' GITLAB_OMNIBUS_CONFIG: | - external_url 'https://example.test.com' #记得修改这里 + external_url 'http://git.site' #璁板緱淇敼杩欓噷 gitlab_rails['time_zone'] = 'Asia/Shanghai' volumes: - /srv/gitlab/config:/etc/gitlab - /srv/gitlab/logs:/var/log/gitlab - - /srv/gitlab/data:/var/opt/gitlab \ No newline at end of file + - /srv/gitlab/data:/var/opt/gitlab + +networks: + default: + external: + name: nginx-proxy \ No newline at end of file