Commit 80a55880 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Revert "Mueve servicio dind a fase de registro" 

This reverts commit 069c7912
parent 069c7912

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

+0 −29
Original line number Diff line number Diff line 
version: '3.9'



services:

  gitlab-dind:

    image: docker:${DIND_IMAGE_TAG}

    environment:

      DOCKER_TLS_CERTDIR: ""

    networks:

      gitlab-net:

    volumes:

      - dind-vol:/var/lib/docker

    cap_add:

      - CAP_SYS_ADMIN

      - CAP_NET_ADMIN

    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-registrar:

    image: ${IMAGE_NAME}:${IMAGE_TAG}

    entrypoint: /bin/sh
@@ -92,9 +66,6 @@ services: 
          memory: ${RESOURCES_RESERVATIONS_MEMORY:-16M}



volumes:

  dind-vol:

    name: ${DIND_VOL_NAME}



  work-vol:

    name: ${WORK_VOL_NAME}

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

+29 −0
Original line number Diff line number Diff line 
version: '3.9'



services:

  gitlab-dind:

    image: docker:${DIND_IMAGE_TAG}

    environment:

      DOCKER_TLS_CERTDIR: ""

    networks:

      gitlab-net:

    volumes:

      - dind-vol:/var/lib/docker

    cap_add:

      - CAP_SYS_ADMIN

      - CAP_NET_ADMIN

    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}

    environment:
@@ -30,6 +56,9 @@ volumes: 
  work-vol:

    name: ${WORK_VOL_NAME}



  dind-vol:

    name: ${DIND_VOL_NAME}



networks:

  gitlab-net:

    name: ${GITLAB_NET_NAME}