Loading .gitlab-ci.yml +2 −2 Original line number Diff line number Diff line Loading @@ -72,7 +72,7 @@ deploy-gitlab-runner-local: COMPOSE_FILE: docker-compose.gitlab-runner-local.tmpl.yml:docker-compose.gitlab-runner-local.dev.yml CI_SERVER_URL: http://gitlab_gitlab-ce REGISTRATION_TOKEN: ${OAGDEV_GITLAB_TOKEN} RUNNER_NAME: OAGDev local RUNNER_NAME: 'OAGDev local' RUNNER_TAG_LIST: oagdev CACHE_S3_SERVER_ADDRESS: minio.redmic.net CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY} Loading Loading @@ -101,7 +101,7 @@ deploy-gitlab-runner-remote: COMPOSE_FILE: docker-compose.gitlab-runner-remote.tmpl.yml:docker-compose.gitlab-runner-remote.dev.yml CI_SERVER_URL: https://gitlab.com REGISTRATION_TOKEN: ${GITLABCOM_GITLAB_TOKEN} RUNNER_NAME: OAGDev remote RUNNER_NAME: 'OAGDev remote' RUNNER_TAG_LIST: oagdev CACHE_S3_SERVER_ADDRESS: minio.redmic.net CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY} Loading gitlab-runner/.env +1 −1 Original line number Diff line number Diff line Loading @@ -2,6 +2,7 @@ CONFIG_FILE=/etc/gitlab-runner/config.toml REGISTER_NON_INTERACTIVE=true REGISTER_LOCKED=false REGISTER_RUN_UNTAGGED=true RUNNER_NAME=gitlab-runner RUNNER_LIMIT=2 RUNNER_REQUEST_CONCURRENCY=2 RUNNER_OUTPUT_LIMIT=40960 Loading @@ -9,7 +10,6 @@ RUNNER_EXECUTOR=docker RUNNER_DOCKER_IMAGE=alpine RUNNER_DOCKER_TLS_VERIFY=false RUNNER_DOCKER_PRIVILEGED=true RUNNER_DOCKER_NETWORK_MODE=gitlab-net RUNNER_DOCKER_DISABLE_CACHE=true RUNNER_DOCKER_SHM_SIZE=1000000000 RUNNER_DOCKER_MEMORY=4g Loading gitlab-runner/docker-compose.gitlab-runner-remote.tmpl.yml +0 −1 Original line number Diff line number Diff line Loading @@ -30,7 +30,6 @@ services: - DOCKER_IMAGE=${RUNNER_DOCKER_IMAGE} - DOCKER_TLS_VERIFY=${RUNNER_DOCKER_TLS_VERIFY} - DOCKER_PRIVILEGED=${RUNNER_DOCKER_PRIVILEGED} - DOCKER_NETWORK_MODE=${RUNNER_DOCKER_NETWORK_MODE} - DOCKER_DISABLE_CACHE=${RUNNER_DOCKER_DISABLE_CACHE} - DOCKER_SHM_SIZE=${RUNNER_DOCKER_SHM_SIZE} - DOCKER_MEMORY=${RUNNER_DOCKER_MEMORY} Loading Loading
.gitlab-ci.yml +2 −2 Original line number Diff line number Diff line Loading @@ -72,7 +72,7 @@ deploy-gitlab-runner-local: COMPOSE_FILE: docker-compose.gitlab-runner-local.tmpl.yml:docker-compose.gitlab-runner-local.dev.yml CI_SERVER_URL: http://gitlab_gitlab-ce REGISTRATION_TOKEN: ${OAGDEV_GITLAB_TOKEN} RUNNER_NAME: OAGDev local RUNNER_NAME: 'OAGDev local' RUNNER_TAG_LIST: oagdev CACHE_S3_SERVER_ADDRESS: minio.redmic.net CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY} Loading Loading @@ -101,7 +101,7 @@ deploy-gitlab-runner-remote: COMPOSE_FILE: docker-compose.gitlab-runner-remote.tmpl.yml:docker-compose.gitlab-runner-remote.dev.yml CI_SERVER_URL: https://gitlab.com REGISTRATION_TOKEN: ${GITLABCOM_GITLAB_TOKEN} RUNNER_NAME: OAGDev remote RUNNER_NAME: 'OAGDev remote' RUNNER_TAG_LIST: oagdev CACHE_S3_SERVER_ADDRESS: minio.redmic.net CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY} Loading
gitlab-runner/.env +1 −1 Original line number Diff line number Diff line Loading @@ -2,6 +2,7 @@ CONFIG_FILE=/etc/gitlab-runner/config.toml REGISTER_NON_INTERACTIVE=true REGISTER_LOCKED=false REGISTER_RUN_UNTAGGED=true RUNNER_NAME=gitlab-runner RUNNER_LIMIT=2 RUNNER_REQUEST_CONCURRENCY=2 RUNNER_OUTPUT_LIMIT=40960 Loading @@ -9,7 +10,6 @@ RUNNER_EXECUTOR=docker RUNNER_DOCKER_IMAGE=alpine RUNNER_DOCKER_TLS_VERIFY=false RUNNER_DOCKER_PRIVILEGED=true RUNNER_DOCKER_NETWORK_MODE=gitlab-net RUNNER_DOCKER_DISABLE_CACHE=true RUNNER_DOCKER_SHM_SIZE=1000000000 RUNNER_DOCKER_MEMORY=4g Loading
gitlab-runner/docker-compose.gitlab-runner-remote.tmpl.yml +0 −1 Original line number Diff line number Diff line Loading @@ -30,7 +30,6 @@ services: - DOCKER_IMAGE=${RUNNER_DOCKER_IMAGE} - DOCKER_TLS_VERIFY=${RUNNER_DOCKER_TLS_VERIFY} - DOCKER_PRIVILEGED=${RUNNER_DOCKER_PRIVILEGED} - DOCKER_NETWORK_MODE=${RUNNER_DOCKER_NETWORK_MODE} - DOCKER_DISABLE_CACHE=${RUNNER_DOCKER_DISABLE_CACHE} - DOCKER_SHM_SIZE=${RUNNER_DOCKER_SHM_SIZE} - DOCKER_MEMORY=${RUNNER_DOCKER_MEMORY} Loading