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

Elimina restricción de nodo y actualiza detalles 

En lugar de restringir nodo, se usa volumen NFSv4. También se adapta el
script para que aproveche montaje de volúmenes del servicio, en lugar de
buscar directamente a los volúmenes.

Nombra contenedor interno.

Revisa variables CI.
parent a12c9b3a

.gitlab-ci.yml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ variables: 
.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}



.scheduled-run:

  variables:

deploy/.env

+0 −1
Original line number Diff line number Diff line
@@ -2,6 +2,5 @@ SERVER_SERVICE=gateway_nginx-proxy-https 
CERTBOT_CONFIG_VOL_NAME=certbot-config-vol

CERTBOT_WORK_VOL_NAME=certbot-work-vol

CERTBOT_LOGS_VOL_NAME=certbot-logs-vol

ACME_VOL_NAME=acme-vol

PUSHGATEWAY_HOST=pushgateway:9091

AWS_REGION=eu-west-1

deploy/docker-compose.dev.yml

+8 −7
Original line number Diff line number Diff line 
version: '3.5'



services:

  certificates-manager:

    deploy:

      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}

          - node.labels.${PLACEMENT_CONSTRAINTS_NODE_LABELS_NAME:-gateway} == ${PLACEMENT_CONSTRAINTS_NODE_LABELS_VALUE:-true}
 
volumes:

  config-vol:

    name: ${CERTBOT_CONFIG_VOL_NAME}

    driver: local

    driver_opts:

      type: ${CERTBOT_CONFIG_VOL_TYPE:-nfs4}

      o: addr=${CERTBOT_CONFIG_VOL_ADDR:-127.0.0.1},${CERTBOT_CONFIG_VOL_OPTIONS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      device: ${CERTBOT_CONFIG_VOL_DEVICE:-:/certbot-config-vol/}

deploy/docker-compose.prod.yml

+4 −0
Original line number Diff line number Diff line
@@ -6,3 +6,7 @@ services: 
      placement:

        constraints:

          - engine.labels.availability_zone == ${AWS_REGION}a



volumes:

  config-vol:

    name: ${CERTBOT_CONFIG_VOL_NAME}

deploy/docker-compose.tmpl.yml

+4 −4
Original line number Diff line number Diff line
@@ -9,15 +9,14 @@ services: 
      DOMAIN_LIST:

      EMAIL_LIST:

      SERVER_SERVICE:

      CERTBOT_CONFIG_VOL_NAME:

      CERTBOT_WORK_VOL_NAME:

      CERTBOT_LOGS_VOL_NAME:

      ACME_VOL_NAME:

      PUSHGATEWAY_HOST:

    networks:

      metric-net:

    volumes:

      - config-vol:/certs

      - acme-vol:/acme

      - docker-vol:/var/lib/docker

      - /var/run/docker.sock:/var/run/docker.sock

    configs:
@@ -47,8 +46,9 @@ networks: 
    external: true



volumes:

  config-vol:

    name: ${CERTBOT_CONFIG_VOL_NAME}

  acme-vol:

    name: ${ACME_VOL_NAME:-acme-vol}

    external: true



  docker-vol:

    name: ${DOCKER_VOL_NAME:-certificates-manager-docker-vol}