Commit 3657121f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/gitlab-runner!2
parents fe54962d c7c093b1

README.md

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ Deployment of a service to run GitLab CI/CD workloads 


At first time, you must deploy `gitlab-runner-registrar` to configure and register a new runner instance. Then, deploy `gitlab-runner` (launching default deployment jobs) to receive jobs to run.



You must tell to your GitLab instance to use Docker in TLS mode before launching your jobs. Set `DOCKER_HOST=tcp://docker:2376` into your parent group or project.



## Delete old runners



Service will try to unregister old version of same runner being registered, before creating the new one.

deploy/.env

+5 −3
Original line number Diff line number Diff line
@@ -14,11 +14,13 @@ RUNNER_LIMIT=1 
RUNNER_REQUEST_CONCURRENCY=3

RUNNER_OUTPUT_LIMIT=40960

RUNNER_EXECUTOR=docker

RUNNER_ENV=DOCKER_TLS_CERTDIR=

RUNNER_ENV=DOCKER_TLS_CERTDIR=/certs



DOCKER_IMAGE=alpine

DOCKER_IMAGE=alpine:latest

DOCKER_PRIVILEGED=true

DOCKER_DISABLE_CACHE=true

DOCKER_DISABLE_CACHE=false

DOCKER_VOLUMES=/certs/client

DOCKER_NETWORK_MODE=gitlab-net

DOCKER_SHM_SIZE=1000000000

DOCKER_MEMORY=4g

DOCKER_MEMORY_RESERVATION=1g

deploy/docker-compose.gitlab-runner-registrar.tmpl.yml

+10 −8
Original line number Diff line number Diff line
@@ -22,21 +22,23 @@ services: 
      RUNNER_OUTPUT_LIMIT:

      RUNNER_EXECUTOR:

      RUNNER_ENV:

      CACHE_TYPE:

      CACHE_SHARED:

      CACHE_S3_SERVER_ADDRESS:

      CACHE_S3_INSECURE:

      CACHE_S3_ACCESS_KEY:

      CACHE_S3_SECRET_KEY:

      CACHE_S3_BUCKET_NAME:

      DOCKER_IMAGE:

      DOCKER_PRIVILEGED:

      DOCKER_DISABLE_CACHE:

      DOCKER_VOLUMES:

      DOCKER_NETWORK_MODE:

      DOCKER_SHM_SIZE:

      DOCKER_MEMORY:

      DOCKER_MEMORY_RESERVATION:

      DOCKER_CPUS:

      DOCKER_TLS_VERIFY: ${RUNNER_DOCKER_TLS_VERIFY}

      CACHE_TYPE:

      CACHE_SHARED:

      CACHE_S3_SERVER_ADDRESS:

      CACHE_S3_INSECURE:

      CACHE_S3_ACCESS_KEY:

      CACHE_S3_SECRET_KEY:

      CACHE_S3_BUCKET_NAME:

    networks:

      gitlab-net:

    volumes:
@@ -53,7 +55,7 @@ services: 
      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-8M}

          memory: ${RESOURCES_LIMITS_MEMORY:-16M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-4M}

deploy/docker-compose.gitlab-runner.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ services: 
          memory: ${RESOURCES_LIMITS_MEMORY:-32M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-16M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-8M}



networks:

  gitlab-net: