Commit 32a92547 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Propaga valor de hostname público al contenedor

parent 17031bc0

.gitlab-ci.yml

+6 −3
Original line number Diff line number Diff line
@@ -170,12 +170,13 @@ deploy-dev: 
    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

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

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}
@@ -193,12 +194,13 @@ deploy-supporting-branch: 
    IMAGE_TAG: ${CI_COMMIT_SHA}

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

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

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

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}
@@ -236,12 +238,13 @@ deploy-pro: 
    IMAGE_TAG: ${CI_COMMIT_TAG}

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

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind

  script:

    - >

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

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}

docker-compose.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ services: 
      - redmic-net

    environment:

      - OAUTH_CLIENT_SECRET

      - PUBLIC_HOSTNAME

    healthcheck:

      test: wget --spider -S -t 3 http://localhost:${WEB_PORT}

      interval: 30s