Commit 742b5e60 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Recupera red, limita recursos y controla defaults

parent a979df54
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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: OAGDevLocal
    RUNNER_TAG_LIST: oagdev
    CACHE_S3_SERVER_ADDRESS: minio.redmic.net
    CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY}
@@ -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: OAGDevRemote
    RUNNER_TAG_LIST: oagdev
    CACHE_S3_SERVER_ADDRESS: minio.redmic.net
    CACHE_S3_ACCESS_KEY: ${MINIO_ACCESS_KEY}
+2 −0
Original line number Diff line number Diff line
@@ -7,9 +7,11 @@ RUNNER_LIMIT=2
RUNNER_REQUEST_CONCURRENCY=2
RUNNER_OUTPUT_LIMIT=40960
RUNNER_EXECUTOR=docker
RUNNER_DOCKER_HOST=unix:///var/run/docker.sock
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
+0 −15
Original line number Diff line number Diff line
version: '3.5'

services:
  gitlab-runner-remote:
    deploy:
      mode: replicated
      replicas: 1
      restart_policy:
        delay: 30s
        window: 1m
      resources:
        limits:
          cpus: '0.5'
          memory: 128M
        reservations:
          memory: 103M

volumes:
  etc-vol:
    name: gitlab-runner-remote-etc-vol
+32 −18
Original line number Diff line number Diff line
@@ -9,27 +9,29 @@ services:
        gitlab-runner register ;
        gitlab-runner run --user=gitlab-runner --working-directory=/home/gitlab-runner"
    environment:
      - CONFIG_FILE
      - CI_SERVER_URL
      - REGISTRATION_TOKEN
      - REGISTER_NON_INTERACTIVE
      - REGISTER_LOCKED
      - REGISTER_RUN_UNTAGGED
      - RUNNER_NAME
      - RUNNER_TAG_LIST
      - RUNNER_LIMIT
      - RUNNER_REQUEST_CONCURRENCY
      - RUNNER_OUTPUT_LIMIT
      - RUNNER_EXECUTOR
      - CACHE_TYPE
      - CACHE_SHARED
      - CACHE_S3_SERVER_ADDRESS
      - CACHE_S3_ACCESS_KEY
      - CACHE_S3_SECRET_KEY
      - CACHE_S3_BUCKET_NAME
      - CONFIG_FILE=
      - CI_SERVER_URL=
      - REGISTRATION_TOKEN=
      - REGISTER_NON_INTERACTIVE=
      - REGISTER_LOCKED=
      - REGISTER_RUN_UNTAGGED=
      - RUNNER_NAME=
      - RUNNER_TAG_LIST=
      - RUNNER_LIMIT=
      - RUNNER_REQUEST_CONCURRENCY=
      - RUNNER_OUTPUT_LIMIT=
      - RUNNER_EXECUTOR=
      - CACHE_TYPE=
      - CACHE_SHARED=
      - CACHE_S3_SERVER_ADDRESS=
      - CACHE_S3_ACCESS_KEY=
      - CACHE_S3_SECRET_KEY=
      - CACHE_S3_BUCKET_NAME=
      - DOCKER_HOST=${RUNNER_DOCKER_HOST}
      - 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}
@@ -41,6 +43,18 @@ services:
      - /var/run/docker.sock:/var/run/docker.sock
      - etc-vol:/etc/gitlab-runner
      - home-vol:/home/gitlab-runner
    deploy:
      mode: replicated
      replicas: 1
      restart_policy:
        delay: 30s
        window: 1m
      resources:
        limits:
          cpus: '0.1'
          memory: 32M
        reservations:
          memory: 16M

networks:
  gitlab-net: