Commit 628ba139 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza deploy de gitlab-runner local 

Corrige variables, permisos de config, cambia variables deprecated, etc.
parent d487791e

.gitlab-ci.yml

+11 −6
Original line number Diff line number Diff line
@@ -70,15 +70,20 @@ deploy-gitlab-runner-local: 
    SERVICES_TO_CHECK: gitlab_gitlab-runner-local

    IMAGE_TAG: alpine

    COMPOSE_FILE: docker-compose.gitlab-runner-local.tmpl.yml:docker-compose.gitlab-runner-local.dev.yml

    GITLAB_URL: https://git.redmic.net

    GITLAB_TOKEN: ${OAGDEV_GITLAB_TOKEN}

    RUNNER_NAME: OAGDev runner

    CI_SERVER_URL: http://gitlab_gitlab-ce

    REGISTRATION_TOKEN: ${OAGDEV_GITLAB_TOKEN}

    RUNNER_NAME: OAGDev

    RUNNER_TAG_LIST: oagdev

    CACHE_S3_SERVER_ADDRESS: minio_minio

    CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY}

    CACHE_S3_SECRET_KEY: ${MINIO_SECRET_KEY}

  script:

    - create-nets.sh gitlab-net

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} GITLAB_URL=${GITLAB_URL}

      GITLAB_TOKEN=${GITLAB_TOKEN} MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY} MINIO_SECRET_KEY=${MINIO_SECRET_KEY}

      RUNNER_NAME="${RUNNER_NAME}"

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} CI_SERVER_URL="${CI_SERVER_URL}"

      REGISTRATION_TOKEN="${REGISTRATION_TOKEN}" RUNNER_NAME="${RUNNER_NAME}" RUNNER_TAG_LIST="${RUNNER_TAG_LIST}"

      CACHE_S3_SERVER_ADDRESS="${CACHE_S3_SERVER_ADDRESS}" CACHE_S3_ACCESS_KEY="${MINIO_ACCESS_KEY}"

      CACHE_S3_SECRET_KEY="${MINIO_SECRET_KEY}"

  environment:

    name: dev/gitlab-runner-local

  only:

gitlab-runner/.env

+17 −16
Original line number Diff line number Diff line 
CONFIG_FILE=/etc/gitlab-runner/config.toml

REGISTER_NON_INTERACTIVE=true

REGISTER_LOCKED=false

REGISTER_RUN_UNTAGGED=true

RUNNER_REQUEST_CONCURRENCY=2

RUNNER_OUTPUT_LIMIT=40960

RUNNER_EXECUTOR=docker

RUNNER_DOCKER_IMAGE=alpine

RUNNER_DOCKER_TLS_VERIFY=false

RUNNER_DOCKER_PRIVILEGED=true

RUNNER_DOCKER_DISABLE_CACHE=true

RUNNER_DOCKER_SHM_SIZE=1000000000

RUNNER_DOCKER_MEMORY=4g

RUNNER_DOCKER_MEMORY_SWAP=6g

RUNNER_DOCKER_MEMORY_RESERVATION=1g

RUNNER_DOCKER_CPUSET_CPUS=1,2

RUNNER_CACHE_TYPE=s3

RUNNER_CACHE_SHARED=true

MINIO_URL=minio.redmic.net

MINIO_ACCESS_KEY=accessKey

MINIO_SECRET_KEY=secretKey

RUNNER_S3_BUCKET_NAME=cache

RUNNER_S3_CACHE_INSECURE=false
 
DOCKER_IMAGE=alpine

DOCKER_TLS_VERIFY=false

DOCKER_PRIVILEGED=true

DOCKER_DISABLE_CACHE=false

DOCKER_SHM_SIZE=1000000000

DOCKER_MEMORY=4g

DOCKER_MEMORY_RESERVATION=1g

DOCKER_CPUS=4

CACHE_TYPE=s3

CACHE_SHARED=true

CACHE_S3_BUCKET_NAME=cache

CACHE_S3_INSECURE=true

gitlab-runner/docker-compose.gitlab-runner-local.dev.yml

+2 −2
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ services: 
      resources:

        limits:

          cpus: '1'

          memory: 1G

          memory: 512M

        reservations:

          memory: 820M

          memory: 410M



volumes:

  etc-vol:

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

+27 −23
Original line number Diff line number Diff line
@@ -9,31 +9,32 @@ services: 
        gitlab-runner register ;

        gitlab-runner run --user=gitlab-runner --working-directory=/home/gitlab-runner"

    environment:

      - CI_SERVER_URL=${GITLAB_URL}

      - REGISTRATION_TOKEN=${GITLAB_TOKEN}

      - REGISTER_NON_INTERACTIVE=true

      - REGISTER_LOCKED=false

      - REGISTER_RUN_UNTAGGED=true

      - RUNNER_TAG_LIST

      - CONFIG_FILE

      - CI_SERVER_URL

      - REGISTRATION_TOKEN

      - REGISTER_NON_INTERACTIVE

      - REGISTER_LOCKED

      - REGISTER_RUN_UNTAGGED

      - RUNNER_NAME

      - RUNNER_TAG_LIST

      - RUNNER_REQUEST_CONCURRENCY

      - RUNNER_OUTPUT_LIMIT

      - RUNNER_EXECUTOR

      - DOCKER_IMAGE=${RUNNER_DOCKER_IMAGE}

      - DOCKER_TLS_VERIFY=${RUNNER_DOCKER_TLS_VERIFY}

      - DOCKER_PRIVILEGED=${RUNNER_DOCKER_PRIVILEGED}

      - DOCKER_DISABLE_CACHE=${RUNNER_DOCKER_DISABLE_CACHE}

      - DOCKER_SHM_SIZE=${RUNNER_DOCKER_SHM_SIZE}

      - DOCKER_MEMORY=${RUNNER_DOCKER_MEMORY}

      - DOCKER_MEMORY_SWAP=${RUNNER_DOCKER_MEMORY_SWAP}

      - DOCKER_MEMORY_RESERVATION=${RUNNER_DOCKER_MEMORY_RESERVATION}

      - DOCKER_CPUSET_CPUS=${RUNNER_DOCKER_CPUSET_CPUS}

      - CACHE_TYPE=${RUNNER_CACHE_TYPE}

      - CACHE_SHARED=${RUNNER_CACHE_SHARED}

      - S3_SERVER_ADDRESS=${MINIO_URL}

      - S3_ACCESS_KEY=${MINIO_ACCESS_KEY}

      - S3_SECRET_KEY=${MINIO_SECRET_KEY}

      - S3_BUCKET_NAME=${RUNNER_S3_BUCKET_NAME}

      - S3_CACHE_INSECURE=${RUNNER_S3_CACHE_INSECURE}

      - DOCKER_IMAGE

      - DOCKER_TLS_VERIFY

      - DOCKER_PRIVILEGED

      - DOCKER_DISABLE_CACHE

      - DOCKER_SHM_SIZE

      - DOCKER_MEMORY

      - DOCKER_MEMORY_RESERVATION

      - DOCKER_CPUS

      - CACHE_TYPE

      - CACHE_SHARED

      - CACHE_S3_SERVER_ADDRESS

      - CACHE_S3_ACCESS_KEY

      - CACHE_S3_SECRET_KEY

      - CACHE_S3_BUCKET_NAME

      - CACHE_S3_INSECURE

    networks:

      - gitlab-net

    volumes:
@@ -42,7 +43,10 @@ services: 
      - home-vol:/home/gitlab-runner

    configs:

      - source: config-toml

        target: /etc/gitlab-runner/config.toml

        target: ${CONFIG_FILE}

        uid: '100'

        gid: '0'

        mode: 0660



networks:

  gitlab-net: