Commit 4edc3f2e authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Asegura creación de volumen acme-vol como NFS

See merge request redmic-project/gateway/certificates-manager!16
parents 12111d55 f88aa2a7

deploy/.env

+4 −0
Original line number Diff line number Diff line
@@ -7,4 +7,8 @@ CERTBOT_CONFIG_VOL_NAME=certbot-config-vol 
CERTBOT_LOGS_VOL_NAME=certbot-logs-vol

ACME_VOL_NAME=acme-vol



VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14



AWS_REGION=eu-west-1

deploy/docker-compose.dev.yml

+12 −4
Original line number Diff line number Diff line
@@ -5,14 +5,22 @@ volumes: 
    name: ${DHPARAMS_VOL_NAME}

    driver: local

    driver_opts:

      type: ${DHPARAMS_VOL_TYPE:-nfs4}

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

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${DHPARAMS_VOL_DEVICE:-:/dhparams-vol/}



  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}

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

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



  acme-vol:

    name: ${ACME_VOL_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${ACME_VOL_DEVICE:-:/acme-vol/}

deploy/docker-compose.prod.yml

+3 −0
Original line number Diff line number Diff line
@@ -13,3 +13,6 @@ volumes: 


  config-vol:

    name: ${CERTBOT_CONFIG_VOL_NAME}



  acme-vol:

    name: ${ACME_VOL_NAME}

deploy/docker-compose.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ services: 
    volumes:

      - dhparams-vol:/dhparams

      - config-vol:/certs

      - acme-vol:/acme

      - /var/lib/docker:/var/lib/docker

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

    configs: