Commit 5ede09b3 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Permite asignar ip de red gateway por entorno

parent 5643d3fd

.env

+1 −1
Original line number Diff line number Diff line 
PUBLIC_HOSTNAME=localhost

UI_AUTH=user:hashpass
 
DOCKER_GWBRIDGE_IP=172.18.0.1

.gitlab-ci.yml

+9 −6
Original line number Diff line number Diff line
@@ -20,13 +20,14 @@ deploy-dev: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    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}

  script:

    - create-nets.sh metric-net

    - >

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

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

      UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

  only:
@@ -39,13 +40,14 @@ deploy-supporting-branch: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    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}

  script:

    - create-nets.sh metric-net

    - >

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

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

      UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

  only:
@@ -61,13 +63,14 @@ deploy-pro: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    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}

  script:

    - create-nets.sh metric-net

    - >

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

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

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

      UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

  only:

docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ services: 
  dockerd-exporter:

    image: stefanprodan/caddy

    environment:

      - DOCKER_GWBRIDGE_IP=172.18.0.1

      - DOCKER_GWBRIDGE_IP

    networks:

      - metric-net

    configs: