pub/gitlab-in-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

many fixes

Browse Source
This commit is contained in:
Vassiliy Yegorov
2022-03-09 17:50:07 +07:00
parent ce436f50b2
commit 2192aba6e7
2 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.env.example
View File

@@ -57,6 +57,13 @@ GITLAB_ROOT_PASSWORD=<any_pass>
# Docker registry domain name # Docker registry domain name
# #
REGISTRY_HOST=docker.<you_domain> REGISTRY_HOST=docker.<you_domain>
REGISTRY_STORAGE_S3_ACCESSKEY=<access-key>
REGISTRY_STORAGE_S3_SECRETKEY=<secret-key>
REGISTRY_STORAGE_S3_REGIONENDPOINT=fra1.digitaloceanspaces.com
REGISTRY_STORAGE_S3_REGION=fra1
REGISTRY_STORAGE_S3_BUCKET=<you-space>
# DB credentials # DB credentials
# #
DB_USER=gitlab DB_USER=gitlab
@@ -90,7 +97,7 @@ S3_APPLICATION_KEY=<application-id>
# Network names # Network names
# #
#SERVICE_NETWORK=gitlab SERVICE_NETWORK=service
WEBPROXY_NETWORK=webproxy WEBPROXY_NETWORK=webproxy
GITLAB_SECRETS_DB_KEY_BASE=<any_pass> GITLAB_SECRETS_DB_KEY_BASE=<any_pass>

73
docker-compose.yml
View File

@@ -14,14 +14,14 @@ services:
# - 443:443 # - 443:443
expose: expose:
- 80 - 80
# labels: labels:
# - "traefik.enable=true" - "traefik.enable=true"
# - "traefik.http.routers.gitlab-server.entrypoints=https" - "traefik.http.routers.gitlab-rm-server.entrypoints=https"
# - "traefik.http.routers.gitlab-server.rule=Host(`${GITLAB_HOST}`)" - "traefik.http.routers.gitlab-rm-server.rule=Host(`${GITLAB_HOST}`)"
# - "traefik.http.routers.gitlab-server.tls=true" - "traefik.http.routers.gitlab-rm-server.tls=true"
# - "traefik.http.routers.gitlab-server.tls.certresolver=letsEncrypt" - "traefik.http.routers.gitlab-rm-server.tls.certresolver=letsEncrypt"
# - "traefik.http.services.gitlab-server-service.loadbalancer.server.port=80" - "traefik.http.services.gitlab-rm-server-service.loadbalancer.server.port=80"
# - "traefik.docker.network=webproxy" - "traefik.docker.network=webproxy"
volumes: volumes:
- ${SERVICE_DATA}/${SERVICE_NAME}/gitlab:/home/git/data:Z - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab:/home/git/data:Z
- ./ssl-certs:/certs - ./ssl-certs:/certs
@@ -41,11 +41,11 @@ services:
- TZ=UTC - TZ=UTC
- GITLAB_TIMEZONE=${GITLAB_TIMEZONE} - GITLAB_TIMEZONE=${GITLAB_TIMEZONE}
- GITLAB_HTTPS=false - GITLAB_HTTPS=true
- SSL_SELF_SIGNED=false - SSL_SELF_SIGNED=false
- GITLAB_HOST=${GITLAB_HOST} - GITLAB_HOST=${GITLAB_HOST}
- GITLAB_PORT=80 - GITLAB_PORT=443
- GITLAB_SSH_PORT=${GITLAB_SSH_PORT} - GITLAB_SSH_PORT=${GITLAB_SSH_PORT}
- GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE} - GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE}
- GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE} - GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE}
@@ -98,8 +98,8 @@ services:
retries: 5 retries: 5
start_period: 2m start_period: 2m
networks: networks:
# - webproxy - ${WEBPROXY_NETWORK}
- service - ${SERVICE_NETWORK}
registry: registry:
image: ${DOCKER_IMAGE_REGISTRY} image: ${DOCKER_IMAGE_REGISTRY}
@@ -107,14 +107,14 @@ services:
restart: always restart: always
expose: expose:
- 5000 - 5000
# labels: labels:
# - "traefik.enable=true" - "traefik.enable=true"
# - "traefik.http.routers.gitlab-registry.entrypoints=https" - "traefik.http.routers.gitlab-rm-registry.entrypoints=https"
# - "traefik.http.routers.gitlab-registry.rule=Host(`${REGISTRY_HOST}`)" - "traefik.http.routers.gitlab-rm-registry.rule=Host(`${REGISTRY_HOST}`)"
# - "traefik.http.routers.gitlab-registry.tls=true" - "traefik.http.routers.gitlab-rm-registry.tls=true"
# - "traefik.http.routers.gitlab-registry.tls.certresolver=letsEncrypt" - "traefik.http.routers.gitlab-rm-registry.tls.certresolver=letsEncrypt"
# - "traefik.http.services.gitlab-registry-service.loadbalancer.server.port=5000" - "traefik.http.services.gitlab-rm-registry-service.loadbalancer.server.port=5000"
# - "traefik.docker.network=webproxy" - "traefik.docker.network=webproxy"
volumes: volumes:
- ${SERVICE_DATA}/${SERVICE_NAME}/gitlab/shared/registry:/registry - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab/shared/registry:/registry
- ./ssl-certs:/certs - ./ssl-certs:/certs
@@ -127,9 +127,16 @@ services:
- REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer
- REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry.crt - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry.crt
- REGISTRY_STORAGE_DELETE_ENABLED=true - REGISTRY_STORAGE_DELETE_ENABLED=true
# - REGISTRY_STORAGE=s3
# - REGISTRY_STORAGE_S3_ACCESSKEY=${REGISTRY_STORAGE_S3_ACCESSKEY}
# - REGISTRY_STORAGE_S3_SECRETKEY=${REGISTRY_STORAGE_S3_SECRETKEY}
# - REGISTRY_STORAGE_S3_REGIONENDPOINT=${REGISTRY_STORAGE_S3_REGIONENDPOINT}
# - REGISTRY_STORAGE_S3_REGION=${REGISTRY_STORAGE_S3_REGION}
# - REGISTRY_STORAGE_S3_BUCKET=${REGISTRY_STORAGE_S3_BUCKET}
# - REGISTRY_STORAGE_CACHE_BLOBDESCRIPTOR=inmemory
networks: networks:
# - webproxy - ${WEBPROXY_NETWORK}
- service - ${SERVICE_NETWORK}
postgresql: postgresql:
image: ${DOCKER_IMAGE_PGSQL} image: ${DOCKER_IMAGE_PGSQL}
@@ -143,7 +150,7 @@ services:
volumes: volumes:
- ${SERVICE_DATA}/${SERVICE_NAME}/postgresql:/var/lib/postgresql:Z - ${SERVICE_DATA}/${SERVICE_NAME}/postgresql:/var/lib/postgresql:Z
networks: networks:
- service - ${SERVICE_NETWORK}
redis: redis:
restart: always restart: always
@@ -154,7 +161,7 @@ services:
volumes: volumes:
- ${SERVICE_DATA}/${SERVICE_NAME}/redis:/var/lib/redis:Z - ${SERVICE_DATA}/${SERVICE_NAME}/redis:/var/lib/redis:Z
networks: networks:
- service - ${SERVICE_NETWORK}
runner_1: runner_1:
image: ${DOCKER_IMAGE_RUNNER} image: ${DOCKER_IMAGE_RUNNER}
@@ -175,7 +182,7 @@ services:
- RUNNER_EXECUTOR=docker - RUNNER_EXECUTOR=docker
- DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
networks: networks:
- service - ${SERVICE_NETWORK}
runner_2: runner_2:
image: ${DOCKER_IMAGE_RUNNER} image: ${DOCKER_IMAGE_RUNNER}
@@ -196,7 +203,7 @@ services:
- RUNNER_EXECUTOR=docker - RUNNER_EXECUTOR=docker
- DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
networks: networks:
- service - ${SERVICE_NETWORK}
runner_3: runner_3:
image: ${DOCKER_IMAGE_RUNNER} image: ${DOCKER_IMAGE_RUNNER}
@@ -217,7 +224,7 @@ services:
- RUNNER_EXECUTOR=docker - RUNNER_EXECUTOR=docker
- DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
networks: networks:
- service - ${SERVICE_NETWORK}
runner_4: runner_4:
image: ${DOCKER_IMAGE_RUNNER} image: ${DOCKER_IMAGE_RUNNER}
@@ -238,7 +245,7 @@ services:
- RUNNER_EXECUTOR=docker - RUNNER_EXECUTOR=docker
- DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
networks: networks:
- service - ${SERVICE_NETWORK}
# backup: # backup:
# image: ${DOCKER_IMAGE_BACKUP} # image: ${DOCKER_IMAGE_BACKUP}
@@ -253,17 +260,17 @@ services:
# - BACKUP_SCHEDULE=${BACKUP_SCHEDULE} # - BACKUP_SCHEDULE=${BACKUP_SCHEDULE}
# - BACKUP_DIR=${BACKUP_DIR} # - BACKUP_DIR=${BACKUP_DIR}
# - DOCKER_COMPOSE_DIR=${DOCKER_COMPOSE_DIR} # - DOCKER_COMPOSE_DIR=${DOCKER_COMPOSE_DIR}
# - SERVICE_NAME=${SERVICE_NAME} # - ${SERVICE_NETWORK}
# - CONTAINER_NAME_GITLAB=${CONTAINER_NAME_GITLAB} # - CONTAINER_NAME_GITLAB=${CONTAINER_NAME_GITLAB}
# - S3_HOST_BASE=${S3_HOST_BASE} # - S3_HOST_BASE=${S3_HOST_BASE}
# - S3_ACCOUNT_ID=${S3_ACCOUNT_ID} # - S3_ACCOUNT_ID=${S3_ACCOUNT_ID}
# - S3_APPLICATION_KEY=${S3_APPLICATION_KEY} # - S3_APPLICATION_KEY=${S3_APPLICATION_KEY}
# networks: # networks:
# - service # - ${SERVICE_NETWORK}
networks: networks:
service: service:
name: ${SERVICE_NAME} name: ${SERVICE_NAME}
# webproxy: webproxy:
# external: external:
# name: ${WEBPROXY_NETWORK} name: ${WEBPROXY_NETWORK}