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

Merge branch 'dev' into 'master' 

Emplea volumen compartido en pro para certificados

See merge request redmic-project/gateway/nginx-proxy-http!15
parents 4c68fbd7 4499ce0d

deploy/.env

+0 −1
Original line number Diff line number Diff line
@@ -2,5 +2,4 @@ HTTP_INTERNAL_PORT=80 
HTTP_PORT=80

PORT_MODE=host



AWS_REGION=eu-west-1

ACME_VOL_NAME=acme-vol

deploy/compose.dev.yaml

+1 −8
Original line number Diff line number Diff line 
services:

  nginx-proxy-http:

    deploy:

      placement:

        constraints:

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



volumes:

  acme-vol:

    name: ${ACME_VOL_NAME}

    driver: ${VOL_DRIVER:-local}

    driver: ${DEV_VOL_DRIVER:-local}

    driver_opts:

      type: ${VOL_TYPE:-nfs}

      o: addr=${VOL_ADDR:-127.0.0.1},vers=${VOL_VERS:-4.2},${VOL_OPTS:-nolock,noacl,noatime,nodiratime}

deploy/compose.prod.yaml

+3 −7
Original line number Diff line number Diff line 
services:

  nginx-proxy-http:

    deploy:

      placement:

        constraints:

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



volumes:

  acme-vol:

    name: ${ACME_VOL_NAME}

    driver: ${PRO_VOL_DRIVER:-cloudstor:aws}

    driver_opts:

      backing: shared

deploy/compose.tmpl.yaml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ services: 
      replicas: ${REPLICAS:-1}

      placement:

        constraints:

          - node.role == manager

          - ${PLACEMENT_CONSTRAINTS_NAME:-node.labels.gateway} ${PLACEMENT_CONSTRAINTS_OPERATOR:-==} ${PLACEMENT_CONSTRAINTS_VALUE:-true}

      restart_policy:

        delay: ${RESTART_DELAY:-0s}

      update_config: