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