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

Merge branch 'dev' into 'master' 

Fija a versión menor de nginx y actualiza CI/CD

See merge request redmic-project/nginx-proxy!9
parents c6f773f2 cdff0ddd

.gitlab-ci.yml

+4 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ stages: 
  - test-package

  - deploy



image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest



variables:

  DOCKER_DRIVER: overlay2

  STACK: ${CI_PROJECT_NAME}
@@ -61,6 +59,7 @@ container-scanning: 


deploy-supporting-branch-develop:

  stage: deploy

  image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -80,6 +79,7 @@ deploy-supporting-branch-develop: 


deploy-stable-branch-develop:

  stage: deploy

  image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
@@ -97,6 +97,7 @@ deploy-stable-branch-develop: 


deploy-supporting-branch-production:

  stage: deploy

  image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
@@ -116,6 +117,7 @@ deploy-supporting-branch-production: 


deploy-stable-branch-production:

  stage: deploy

  image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

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

Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM nginx:alpine

FROM nginx:1.15-alpine



LABEL maintainer="info@redmic.es"

deploy/docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ services: 
        constraints:

          - node.role == manager

      restart_policy:

        delay: 10s

        delay: 3s

        window: 1m

      resources:

        limits:

nginx/conf.d/client-cache-definition.conf

0 → 100644
+21 −0
Original line number Diff line number Diff line 
# Preparación de evaluación de control de caché para un dominio concreto, según parámetros

map $arg_request $cache_control_atlas_value {

	GetMap "max-age=864000";

	GetTile "max-age=864000";

	default "no-cache";

}



# Preparación de evaluación de control de caché para un dominio concreto, según ruta

map $request_uri $cache_control_redmic_value {

	~^/api/.* "no-cache max-age=3600";

	default "max-age=3600";

}



# Evaluación de control de caché del lado del cliente según dominio

# Crear variables '$cache_control_<dominio>_value' según sea necesario

map $http_host $cache_control_value {

	hostnames;

	atlas.* $cache_control_atlas_value;

	redmic.* $cache_control_redmic_value;

	default "no-cache";

}

nginx/conf.d/default.conf

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ server { 
	location / {

		include /etc/nginx/snippets/cache-usage.conf;



		add_header X-Frame-Options "SAMEORIGIN";



		proxy_set_header Host $host;

		proxy_set_header Upgrade $http_upgrade;

		proxy_set_header Connection $connection_upgrade;