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

Merge branch 'dev' into 'master' 

Aumenta memoria reservada por defecto

See merge request redmic-project/static-pages!18
parents bc51f568 92fce967

build/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ FROM nginx:${NGINX_IMAGE_TAG} 
LABEL maintainer="info@redmic.es"



HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=10 \

	CMD wget --spider -q http://localhost/nginx-health || exit 1

	CMD wget --spider -q http://127.0.0.1/nginx-health || exit 1



COPY static-pages.conf /etc/nginx/conf.d/default.conf

COPY content /usr/share/nginx/html

deploy/compose.yaml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ services: 
          memory: ${RESOURCES_LIMITS_MEMORY:-32M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-4M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-16M}



networks:

  traefik-net: