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

Concreta dominio a Traefik, elimina red redmic-net 

De esta manera, dejará de escuchar todos los subdominios para los que no
haya otro servicio escuchando.
parent f1d2b3b3

.gitlab-ci.yml

+8 −4
Original line number Diff line number Diff line
@@ -201,12 +201,13 @@ deploy-supporting-branch-develop: 
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    OAUTH_URL: ${DEV_OAUTH_URL}

    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_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

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

  environment:

    name: dev

    url: https://${DEV_PUBLIC_HOSTNAME}
@@ -230,12 +231,13 @@ deploy-stable-branch-develop: 
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    OAUTH_URL: ${DEV_OAUTH_URL}

    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_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

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

  environment:

    name: dev

    url: https://${DEV_PUBLIC_HOSTNAME}
@@ -258,12 +260,13 @@ deploy-supporting-branch-production: 
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    OAUTH_URL: ${PRO_OAUTH_URL}

    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_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

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

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}
@@ -287,12 +290,13 @@ deploy-stable-branch-production: 
    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    OAUTH_URL: ${PRO_OAUTH_URL}

    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_URL=${OAUTH_URL} OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}

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

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}

deploy/docker-compose.tmpl.yml

+4 −10
Original line number Diff line number Diff line
@@ -7,28 +7,25 @@ services: 
      - OAUTH_URL

      - OAUTH_CLIENT_SECRET

    networks:

      - redmic-net

      - traefik-net

    healthcheck:

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

      interval: 30s

      timeout: 10s

      retries: 3

      start_period: 2m

      start_period: 1m

    deploy:

      mode: replicated

      replicas: 1

      labels:

        traefik.port: '${WEB_PORT}'

        traefik.docker.network: traefik-net

        traefik.default.frontend.rule: PathPrefix:/

        traefik.es.frontend.rule: HostRegexp:{subdomain:^es\\..*$$}

        traefik.es.frontend.priority: '13'

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

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

        traefik.es.frontend.redirect.regex: ^(.*):\\/\\/es\\.(.*)$$

        traefik.es.frontend.redirect.replacement: $$1://$$2

        traefik.es.frontend.redirect.permanent: 'true'

        traefik.en.frontend.rule: HostRegexp:{subdomain:^en\\..*$$}

        traefik.en.frontend.priority: '13'

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

        traefik.en.frontend.headers.customRequestHeaders: content-language:en

        traefik.backend: web

        traefik.frontend.errors.5xx.status: 500-599
@@ -45,8 +42,5 @@ services: 
          memory: 103M



networks:

  redmic-net:

    external: true



  traefik-net:

    external: true