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

Merge branch 'dev' into 'master' 

Corrige redirección de errores 5xx propios

See merge request redmic-project/static-pages!16
parents d4dbe553 f4a3400f

.gitlab-ci.yml

+1 −7
Original line number Diff line number Diff line
@@ -15,12 +15,6 @@ stages: 
  - post-package

  - deploy



variables:

  PROJECT_PARENT_NAME: static-pages



.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}

  environment:

    url: https://${DD_STATIC_SUBDOMAIN}.${PUBLIC_HOSTNAME}
 
    STACK: static-pages

Dockerfile

+1 −1
Original line number Diff line number Diff line 
ARG NGINX_IMAGE_TAG=1.19-alpine

ARG NGINX_IMAGE_TAG



FROM nginx:${NGINX_IMAGE_TAG}

deploy/.env

+2 −1
Original line number Diff line number Diff line 
NGINX_IMAGE_TAG=1.19-alpine

NGINX_IMAGE_TAG=1.23.2-alpine



PUBLIC_HOSTNAME=change.me

TRAEFIK_ENTRYPOINT=http

deploy/docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'
 
version: '3.9'

deploy/docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'
 
version: '3.9'