Commit ccceadf8 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Cambia estrategia de creación de runner, por cmd 

Reubica configuraciones de fichero a línea de comandos, ya que no hay
manera actualmente de registrar un runner a partir del fichero de
configuración.
parent 6e17a4f7

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ deploy-gitlab-runner-dev: 
  script:

    - create-nets.sh gitlab-net

    - >

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

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

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

  environment:

    name: dev/${SERVICE}

gitlab-runner/.env

0 → 100644
+10 −0
Original line number Diff line number Diff line 
GITLAB_URL=https://git.redmic.net

RUNNER_NAME="REDMIC GitLabCI Runner"

RUNNER_OUTPUT_LIMIT=40960

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_S3_SERVER_ADDRESS=minio.redmic.net

RUNNER_CACHE_S3_BUCKET_NAME=cache

gitlab-runner/config.toml

deleted100755 → 0
+0 −29
Original line number Diff line number Diff line 
concurrent = 2

check_interval = 10



[[runners]]

  name = "REDMIC GitLabCI Runner"

  url = "https://git.redmic.net"

  token = "${RUNNER_TOKEN}"

  executor = "docker"

  output_limit = 4096



  [runners.docker]

    tls_verify = false

    image = "alpine"

    privileged = true

    disable_cache = true

    shm_size = 1000000000

    memory = "4g"

    memory_swap = "6g"

    memory_reservation = "1g"

    cpuset_cpus = "1,2"



  [runners.cache]

    Type = "s3"

    ServerAddress = "minio.redmic.net"

    AccessKey = "${MINIO_ACCESS_KEY}"

    SecretKey = "${MINIO_SECRET_KEY}"

    BucketName = "cache"

    Insecure = false

    Shared = true

gitlab-runner/config/config.toml

0 → 100755
+2 −0
Original line number Diff line number Diff line 
concurrent = 2

check_interval = 10

gitlab-runner/docker-compose.tmpl.yml

+25 −4
Original line number Diff line number Diff line
@@ -3,15 +3,36 @@ version: '3.5' 
services:

  gitlab-runner:

    image: gitlab/gitlab-runner:${IMAGE_TAG:-latest}

    command: |

      gitlab-runner register \

      --url ${GITLAB_URL} \

      --registration-token ${GITLAB_TOKEN} \

      --name "${RUNNER_NAME}" \

      --output_limit ${RUNNER_OUTPUT_LIMIT} \

      --executor "docker" \

      --docker-image "alpine" \

      --docker-tlsverify "false" \

      --docker-privileged "true" \

      --docker-disable-cache "true" \

      --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 "s3" \

      --cache-s3-server-address ${RUNNER_CACHE_S3_SERVER_ADDRESS} \

      --cache-s3-access-key "${MINIO_ACCESS_KEY}" \

      --cache-s3-secret-key "${MINIO_SECRET_KEY}" \

      --cache-s3-bucket-name "${RUNNER_CACHE_S3_BUCKET_NAME}" \

      --cache-s3-insecure "false" \

      --cache-cache-shared "true"

    networks:

      - gitlab-net

    volumes:

      - /var/run/docker.sock:/var/run/docker.sock

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

      - ./config:/etc/gitlab-runner

    environment:

      - RUNNER_TOKEN

      - MINIO_ACCESS_KEY

      - MINIO_SECRET_KEY

      - REGISTER_NON_INTERACTIVE=true



networks:

  gitlab-net: