Commit 3d3fe6c3 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Revert "Cambia servicio dind por contenedor local" 

This reverts commit c8a58c27.
parent ae9bca02

deploy/.env

+1 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ DOCKER_IMAGE=alpine:latest 
DOCKER_PRIVILEGED=true

DOCKER_OOM_KILL_DISABLE=true

DOCKER_DISABLE_CACHE=false

DOCKER_NETWORK_MODE=gitlab-net

DOCKER_SHM_SIZE=1000000000

DOCKER_MEMORY=4g

DOCKER_MEMORY_RESERVATION=1g
@@ -45,8 +46,6 @@ CONFIG_VOL_NAME=gitlab-runner-config-vol 
CONFIG_VOL_DEVICE=:/gitlab-runner-config-vol/

DIND_VOL_NAME=gitlab-runner-dind-vol

WORK_VOL_NAME=gitlab-runner-work-vol

CONFIG_DIR=/etc/gitlab-runner

WORK_DIR=/home/gitlab-runner



GITLAB_NET_NAME=gitlab-net

GITLAB_NET_DRIVER=overlay

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

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ services: 
    networks:

      gitlab-net:

    volumes:

      - config-vol:${CONFIG_DIR}

      - work-vol:${WORK_DIR}

      - config-vol:/etc/gitlab-runner

      - work-vol:/home/gitlab-runner

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

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

+31 −23
Original line number Diff line number Diff line 
version: '3.9'



services:

  gitlab-dind:

    image: docker:${DIND_IMAGE_TAG}

    command: --tls=false

    environment:

      DOCKER_TLS_CERTDIR: ""

    networks:

      gitlab-net:

    volumes:

      - dind-vol:/var/lib/docker

    cap_add:

      - SYS_ADMIN

      - NET_ADMIN

    security_opt:

      - apparmor:unconfined

    deploy:

      mode: replicated

      replicas: ${DIND_REPLICAS:-1}

      restart_policy:

        delay: ${DIND_RESTART_DELAY:-5s}

      update_config:

        delay: ${DIND_UPDATE_DELAY:-1m}

      resources:

        limits:

          cpus: '${DIND_RESOURCES_LIMITS_CPUS:-4}'

          memory: ${DIND_RESOURCES_LIMITS_MEMORY:-4G}

        reservations:

          cpus: '${DIND_RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${DIND_RESOURCES_RESERVATIONS_MEMORY:-1G}



  gitlab-runner:

    image: ${IMAGE_NAME}:${IMAGE_TAG}

    entrypoint:

      - docker network create ${GITLAB_NET_NAME} || true

      - >

        docker run --rm -d

          --name gitlab-dind

          -e DOCKER_TLS_CERTDIR=""

          -v gitlab-runner-dind-vol:/var/lib/docker

          --network ${GITLAB_NET_NAME}

          --privileged

          --restart always

          --cpus ${DIND_CPUS:-4}

          --memory ${DIND_MEMORY:-4G}

          --memory-reservation ${DIND_MEMORY_RESERVATION:-1G}

          docker:${DIND_IMAGE_TAG}

          --tls=false

      - /usr/bin/dumb-init

      - /entrypoint

    command:

      - run

      - --user=gitlab-runner

      - --working-directory=${WORK_DIR}

    environment:

      CONFIG_FILE:

      DOCKER_HOST: ${RUNNER_DOCKER_HOST}
@@ -31,8 +39,8 @@ services: 
      gitlab-net:

    volumes:

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

      - config-vol:${CONFIG_DIR}

      - work-vol:${WORK_DIR}

      - config-vol:/etc/gitlab-runner

      - work-vol:/home/gitlab-runner

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}