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

Merge branch 'dev' into 'master' 

Renombra página 50x y limita memoria en pro

See merge request redmic-project/static-pages!11
parents 695b4c57 c9f4ba1a

content/50x/index.html→content/maintenance/index.html

+0 −0

File moved.

View file

docker-compose.prod.yml

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ services: 
        traefik.static.frontend.rule: Host:${STATIC_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.static.backend: static-pages

        traefik.web-error-handle.port: "${INTERNAL_PORT}"

        traefik.web-error-handle.frontend.rule: Host:${PUBLIC_HOSTNAME};ReplacePathRegex:^.*?(resources/[^/]+\\.\\w+)?$$ /50x/$$1

        traefik.web-error-handle.frontend.rule: Host:${PUBLIC_HOSTNAME};ReplacePathRegex:^.*?(resources/[^/]+\\.\\w+)?$$ /maintenance/$$1

        traefik.web-error-handle.frontend.priority: "1"

        traefik.web-error-handle.backend: static-pages

      restart_policy:
@@ -22,7 +22,7 @@ services: 
      resources:

        limits:

          cpus: '0.1'

          memory: 100M

          memory: 50M

        reservations:

          memory: 10M