update
This commit is contained in:
parent
97018ca824
commit
09d4e704df
6
.env
6
.env
@ -2,4 +2,8 @@ hostname=gitlab.zziyu.cn
|
|||||||
external_url=https://gitlab.zziyu.cn
|
external_url=https://gitlab.zziyu.cn
|
||||||
email=Zengtudor@outlook.com
|
email=Zengtudor@outlook.com
|
||||||
gitlab_root=/root/gitlab
|
gitlab_root=/root/gitlab
|
||||||
mem_limit=2048m
|
# gitlab_root=C:\Users\Zengt\Documents\gitlab
|
||||||
|
mem_limit=2048m
|
||||||
|
http_port=3080
|
||||||
|
ssh_port=3022
|
||||||
|
shm_size=512mb
|
@ -1,10 +1,10 @@
|
|||||||
version: '2'
|
|
||||||
services:
|
services:
|
||||||
gitlab:
|
gitlab:
|
||||||
image: 'twang2218/gitlab-ce-zh:11.1.4'
|
image: 'twang2218/gitlab-ce-zh:11.1.4'
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
hostname: $hostname
|
hostname: $hostname
|
||||||
mem_limit: $mem_limit
|
mem_limit: $mem_limit
|
||||||
|
shm_size: $shm_size
|
||||||
environment:
|
environment:
|
||||||
TZ: 'Asia/Shanghai'
|
TZ: 'Asia/Shanghai'
|
||||||
GITLAB_OMNIBUS_CONFIG: |
|
GITLAB_OMNIBUS_CONFIG: |
|
||||||
@ -13,7 +13,7 @@ services:
|
|||||||
nginx['enable'] = false
|
nginx['enable'] = false
|
||||||
gitlab_workhorse['listen_network'] = "tcp"
|
gitlab_workhorse['listen_network'] = "tcp"
|
||||||
gitlab_workhorse['listen_addr'] = "0.0.0.0:80"
|
gitlab_workhorse['listen_addr'] = "0.0.0.0:80"
|
||||||
gitlab_rails['trusted_proxies'] = ['127.0.0.1']
|
gitlab_rails['trusted_proxies'] = ['0.0.0.0']
|
||||||
# 需要配置到 gitlab.rb 中的配置可以在这里配置,每个配置一行,注意缩进。
|
# 需要配置到 gitlab.rb 中的配置可以在这里配置,每个配置一行,注意缩进。
|
||||||
# 比如下面的电子邮件的配置:
|
# 比如下面的电子邮件的配置:
|
||||||
# gitlab_rails['smtp_enable'] = true
|
# gitlab_rails['smtp_enable'] = true
|
||||||
@ -26,9 +26,8 @@ services:
|
|||||||
# gitlab_rails['smtp_tls'] = true
|
# gitlab_rails['smtp_tls'] = true
|
||||||
gitlab_rails['gitlab_email_from'] = '$email'
|
gitlab_rails['gitlab_email_from'] = '$email'
|
||||||
ports:
|
ports:
|
||||||
- '3080:80'
|
- '$http_port:80'
|
||||||
- '3443:443'
|
- '$ssh_port:22'
|
||||||
- '3022:22'
|
|
||||||
volumes:
|
volumes:
|
||||||
- $gitlab_root/config:/etc/gitlab
|
- $gitlab_root/config:/etc/gitlab
|
||||||
- $gitlab_root/data:/var/opt/gitlab
|
- $gitlab_root/data:/var/opt/gitlab
|
||||||
|
Loading…
Reference in New Issue
Block a user