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

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

Evita que una actualización de nginx rompa el servicio.

Parametriza imagen de despliegue y revisa la configuración de
despliegue.
parent 4f20d9a5

.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: