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

Corrige bug de config de entorno en despliegue

parent ecc1d4e9

.gitlab-ci.yml

+20 −20
Original line number Diff line number Diff line
@@ -41,18 +41,18 @@ deploy-supporting-branch-develop: 
    - master

  when: manual



deploy-supporting-branch-production:

deploy-stable-branch-develop:

  stage: deploy

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.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}

    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_URL: ${SLACK_URL}

    SLACK_CHANNEL: ${PRO_SLACK_CHANNEL}

    SLACK_CHANNEL: ${DEV_SLACK_CHANNEL}

    SLACK_USER: ${SLACK_USER}

  script:

    - create-nets.sh metric-net
@@ -61,25 +61,23 @@ deploy-supporting-branch-production: 
      DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP} UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      SLACK_URL=${SLACK_URL} SLACK_CHANNEL=${SLACK_CHANNEL} SLACK_USER=${SLACK_USER}

  environment:

    name: pro

    name: dev

  only:

    - branches

  except:

    - master

  when: manual



deploy-stable-branch-develop:

deploy-supporting-branch-production:

  stage: deploy

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.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}

    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_URL: ${SLACK_URL}

    SLACK_CHANNEL: ${DEV_SLACK_CHANNEL}

    SLACK_CHANNEL: ${PRO_SLACK_CHANNEL}

    SLACK_USER: ${SLACK_USER}

  script:

    - create-nets.sh metric-net
@@ -88,8 +86,10 @@ deploy-stable-branch-develop: 
      DOCKER_GWBRIDGE_IP=${DOCKER_GWBRIDGE_IP} UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      SLACK_URL=${SLACK_URL} SLACK_CHANNEL=${SLACK_CHANNEL} SLACK_USER=${SLACK_USER}

  environment:

    name: dev

    name: pro

  only:

    - branches

  except:

    - master

  when: manual