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

Merge branch 'dev' into 'master' 

Actualiza variables y parametriza deploy

See merge request redmic-project/metric/swarmprom-ci!21
parents 27036a1a 087201d4

.gitlab-ci.yml

+1 −23
Original line number Diff line number Diff line 
stages:

  - deploy



image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}



services:

  - docker:dind
@@ -13,20 +13,13 @@ variables: 
  STATUS_CHECK_DELAY: 60

  STACK: metric

  SERVICES_TO_CHECK: metric_dockerd-exporter metric_cadvisor metric_grafana metric_alertmanager metric_unsee metric_node-exporter metric_pushgateway

  SLACK_URL: ${SLACK_URL}

  SLACK_USER: ${SLACK_USER}



deploy-supporting-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    ADMIN_USER: ${DEV_ADMIN_USER}

    ADMIN_PASSWORD: ${DEV_ADMIN_PASSWORD}

    DOCKER_GWBRIDGE_IP: ${DEV_DOCKER_GWBRIDGE_IP}

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    SLACK_CHANNEL: ${DEV_SLACK_CHANNEL}

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}
@@ -45,12 +38,7 @@ deploy-stable-branch-develop: 
  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    ADMIN_USER: ${DEV_ADMIN_USER}

    ADMIN_PASSWORD: ${DEV_ADMIN_PASSWORD}

    DOCKER_GWBRIDGE_IP: ${DEV_DOCKER_GWBRIDGE_IP}

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    SLACK_CHANNEL: ${DEV_SLACK_CHANNEL}

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}
@@ -67,12 +55,7 @@ deploy-supporting-branch-production: 
  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    ADMIN_USER: ${PRO_ADMIN_USER}

    ADMIN_PASSWORD: ${PRO_ADMIN_PASSWORD}

    DOCKER_GWBRIDGE_IP: ${PRO_DOCKER_GWBRIDGE_IP}

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    SLACK_CHANNEL: ${PRO_SLACK_CHANNEL}

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}
@@ -91,12 +74,7 @@ deploy-stable-branch-production: 
  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    ADMIN_USER: ${PRO_ADMIN_USER}

    ADMIN_PASSWORD: ${PRO_ADMIN_PASSWORD}

    DOCKER_GWBRIDGE_IP: ${PRO_DOCKER_GWBRIDGE_IP}

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    SLACK_CHANNEL: ${PRO_SLACK_CHANNEL}

  script:

    - >

      deploy.sh COMPOSE_FILE=${COMPOSE_FILE} ADMIN_USER=${ADMIN_USER} ADMIN_PASSWORD=${ADMIN_PASSWORD}

docker-compose.prod.yml

+1 −3
Original line number Diff line number Diff line
@@ -18,6 +18,4 @@ volumes: 
    name: ${GRAFANA_VOL_NAME:-grafana-vol}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: 1

      ebstype: gp2
 
      backing: shared

swarmprom @ b2768678

Compare 232f44bf to b2768678
Original line number Diff line number Diff line 
Subproject commit 232f44bfa21b12ae77f75d4f604a4d1c449160d8
 
Subproject commit b276867815af6c5c63ba03bd3ef4bd649ec2ec11