Commit 24a66889 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Elimina red gitlab-net y actualiza deploys 

Aprovecha para actualizar detalles de los deploy de los servicios
relacionados con el entorno de gitlab.
parent faf96351

.gitlab-ci.yml

+0 −2
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ deploy-gitlab-ce-dev: 
    SMTP_DOMAIN: ${OAGDEV_GITLAB_SMTP_DOMAIN}

  script:

    - echo "${AUTHORIZED_KEYS_PROXY}" > "${DEPLOY_DIR_NAME}/authorized_keys_proxy"

    - create-nets.sh gitlab-net

    - >

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

      AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} SMTP_ADDR=${SMTP_ADDR}
@@ -80,7 +79,6 @@ deploy-gitlab-runner-dev: 
    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} CI_SERVER_URL="${CI_SERVER_URL_REMOTE}"

      REGISTRATION_TOKEN="${REGISTRATION_TOKEN_REMOTE}" RUNNER_NAME="${RUNNER_NAME}"

gitlab-ce/docker-compose.dev.yml

+7 −24
Original line number Diff line number Diff line
@@ -9,35 +9,18 @@ services: 
    secrets:

      - source: authorized_keys_proxy

        target: /gitlab-data/ssh/authorized_keys

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "80"

        traefik.docker.network: traefik-net

        traefik.gitlab.frontend.rule: Host:${GITLAB_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.registry.frontend.rule: Host:${GITLAB_REGISTRY_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.backend: gitlab

      restart_policy:

        delay: 2m

        window: 5m

      resources:

        limits:

          cpus: '2'

          memory: 4G

        reservations:

          memory: 3G



volumes:

  gitlab-ce-config-vol:

    name: gitlab-ce-config-vol

  config-vol:

    name: ${CONFIG_VOL_NAME:-gitlab-ce-config-vol}



  gitlab-ce-log-vol:

    name: gitlab-ce-log-vol

  log-vol:

    name: ${LOG_VOL_NAME:-gitlab-ce-log-vol}



  gitlab-ce-data-vol:

    name: gitlab-ce-data-vol

  data-vol:

    name: ${DATA_VOL_NAME:-gitlab-ce-data-vol}



secrets:

  authorized_keys_proxy:

    name: ${AUTHORIZED_KEYS_PROXY_NAME:-gitlab-authorized-keys-proxy}

    file: ./authorized_keys_proxy

gitlab-ce/docker-compose.tmpl.yml

+21 −7
Original line number Diff line number Diff line
@@ -27,16 +27,30 @@ services: 
        gitlab_rails['smtp_enable_starttls_auto'] = true

        gitlab_rails['smtp_tls'] = false

    networks:

      - gitlab-net

      - traefik-net

    volumes:

      - gitlab-ce-config-vol:/etc/gitlab

      - gitlab-ce-log-vol:/var/log/gitlab

      - gitlab-ce-data-vol:/var/opt/gitlab

      - config-vol:/etc/gitlab

      - log-vol:/var/log/gitlab

      - data-vol:/var/opt/gitlab

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.gitlab.frontend.rule: Host:${GITLAB_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.registry.frontend.rule: Host:${GITLAB_REGISTRY_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.backend: gitlab-ce

        traefik.port: '80'

      restart_policy:

        delay: 1m

        window: 5m

      resources:

        limits:

          cpus: '2'

          memory: 4G

        reservations:

          memory: 2G



networks:

  gitlab-net:

    external: true



  traefik-net:

    name: ${TRAEFIK_NET_NAME:-traefik-net}

    external: true

gitlab-runner/docker-compose.tmpl.yml

+0 −6
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ services: 
      - DOCKER_MEMORY=${RUNNER_DOCKER_MEMORY}

      - DOCKER_MEMORY_RESERVATION=${RUNNER_DOCKER_MEMORY_RESERVATION}

      - DOCKER_CPUS=${RUNNER_DOCKER_CPUS}

    networks:

      - gitlab-net

    volumes:

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

      - etc-vol:/etc/gitlab-runner
@@ -53,7 +51,3 @@ services: 
          memory: 32M

        reservations:

          memory: 16M
 


networks:

  gitlab-net:

    external: true

minio/docker-compose.dev.yml

+2 −19
Original line number Diff line number Diff line
@@ -6,27 +6,10 @@ services: 
      - target: 9000

        published: ${MINIO_PORT}

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: "9000"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: Host:minio.${PUBLIC_HOSTNAME}

        traefik.backend: minio

      restart_policy:

        delay: 30s

        window: 2m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M



volumes:

  data-vol:

    name: minio-data-vol

    name: ${MINIO_DATA_VOL_NAME:-minio-data-vol}



  export-vol:

    name: minio-export-vol
 
    name: ${MINIO_EXPORT_VOL_NAME:-minio-export-vol}