Commit 2eaf488f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza backend de Traefik para manejar errores

See merge request redmic-project/client/web!7
parents 1f251a6f c5d4ee81

.gitlab-ci.yml

+3 −2
Original line number Diff line number Diff line
@@ -276,8 +276,9 @@ deploy-pro: 
  variables:

    DOCKER_DRIVER: overlay2

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: redmic

    SERVICES_TO_CHECK: redmic_${CI_PROJECT_NAME}

    STATUS_CHECK_DELAY: '60'

    STACK: client

    SERVICES_TO_CHECK: client_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

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

docker-compose.prod.yml

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ services: 
        traefik.docker.network: traefik-net

        traefik.frontend.rule: PathPrefix:/

        traefik.frontend.errors.50x.status: "502-504"

        traefik.frontend.errors.50x.backend: web-error

        traefik.frontend.errors.50x.query: '/'

        traefik.frontend.errors.50x.backend: static-pages

        traefik.frontend.errors.50x.query: '/50x'

        traefik.backend: web

      placement:

        constraints: