diff --git a/.env b/.env index 76b4d6f..450daf1 100644 --- a/.env +++ b/.env @@ -1,3 +1,6 @@ -SERVER_HOST=gitlab.zziyu.cn -EXTERN_URL=https://gitlab.zziyu.cn -GITLAB_HOME=/root/gitlab/data \ No newline at end of file +GITLAB_HOSTNAME=gitlab.zziyu.cn +GITLAB_ROOT_PASSWORD=123456 +POSTGRES_PASSWORD=123456 +POSTGRES_USER=123456 +GITLAB_HOME=/root/gitlab/data +# EXTERN_URL=https://gitlab.zziyu.cn diff --git a/docker-compose.yml b/docker-compose.yml index f3ef09f..5391271 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,20 @@ version: '3.6' services: gitlab: - image: gitlab/gitlab-ce:latest - container_name: gitlab + image: alpinelinux/gitlab:17.3 + container_name: minigitlab restart: always hostname: '$SERVER_HOST' environment: - GITLAB_OMNIBUS_CONFIG: | + GITLAB_HOSTNAME:'$GITLAB_HOSTNAME' + GITLAB_ROOT_PASSWORD:'$GITLAB_ROOT_PASSWORD' + POSTGRES_PASSWORD:'$POSTGRES_PASSWORD' + POSTGRES_USER:'$POSTGRES_USER' + TZ :'Asia/Shanghai' + # GITLAB_OMNIBUS_CONFIG: | # Add any other gitlab.rb configuration here, each on its own line - external_url '$EXTERN_URL' - TZ : "Asia/Shanghai" + # external_url '$EXTERN_URL' + ports: - '3080:80' - '3443:443'