This commit is contained in:
Vassiliy Yegorov
2022-09-25 21:23:13 +07:00
parent cfdd245655
commit 24fd31fff4

View File

@@ -128,14 +128,14 @@ 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_FILESYSTEM_ROOTDIRECTORY=/registry # - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry
# - REGISTRY_STORAGE=s3 - 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 - REGISTRY_STORAGE_CACHE_BLOBDESCRIPTOR=inmemory
expose: expose:
- 5000 - 5000
networks: networks:
@@ -172,47 +172,47 @@ services:
volumes: volumes:
- ${SERVICE_DATA}/${SERVICE_NAME}/redis:/var/lib/redis:Z - ${SERVICE_DATA}/${SERVICE_NAME}/redis:/var/lib/redis:Z
# runner_1: &runner runner_1: &runner
# image: ${DOCKER_IMAGE_RUNNER} image: ${DOCKER_IMAGE_RUNNER}
# container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_1 container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_1
# restart: always restart: always
# depends_on: depends_on:
# - gitlab - gitlab
# command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
# environment: environment:
# - CI_SERVER_URL=https://${GITLAB_HOST} - CI_SERVER_URL=https://${GITLAB_HOST}
# - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP} - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
# - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER} - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
# - RUNNER_TOKEN=${RUNNER_TOKEN} - RUNNER_TOKEN=${RUNNER_TOKEN}
# - RUNNER_DESCRIPTION=gitab-runner_1 - RUNNER_DESCRIPTION=gitab-runner_1
# - 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_NETWORK} - ${SERVICE_NETWORK}
# volumes: volumes:
# - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_1:/etc/gitlab-runner - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_1:/etc/gitlab-runner
# - /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
# runner_2: runner_2:
# <<: *runner <<: *runner
# container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_2 container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_2
# environment: environment:
# - RUNNER_DESCRIPTION=gitab-runner_2 - RUNNER_DESCRIPTION=gitab-runner_2
# volumes: volumes:
# - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_2:/etc/gitlab-runner - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_2:/etc/gitlab-runner
# runner_3: runner_3:
# <<: *runner <<: *runner
# container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_3 container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_3
# environment: environment:
# - RUNNER_DESCRIPTION=gitab-runner_3 - RUNNER_DESCRIPTION=gitab-runner_3
# volumes: volumes:
# - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_3:/etc/gitlab-runner - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_3:/etc/gitlab-runner
# runner_4: runner_4:
# <<: *runner <<: *runner
# container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_4 container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_4
# environment: environment:
# - RUNNER_DESCRIPTION=gitab-runner_4 - RUNNER_DESCRIPTION=gitab-runner_4
# volumes: volumes:
# - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_4:/etc/gitlab-runner - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_4:/etc/gitlab-runner