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

Merge branch 'dev' into 'master' 

Corrige nombre var DESIRED_WORKER_ID y elimina cond on-failure

See merge request redmic-project/server/vessel/postgresql!13
parents d990d0b8 a64f3bf0

deploy/docker-compose.backup-db.prod.yml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ services: 
      placement:

        constraints:

          - node.role == worker

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

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

      restart_policy:

        condition: on-failure

        delay: 1m

deploy/docker-compose.postgresql.dev.yml

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ services: 
      mode: replicated

      replicas: 1

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

      resources:

deploy/docker-compose.postgresql.prod.yml

+1 −2
Original line number Diff line number Diff line
@@ -8,9 +8,8 @@ services: 
      placement:

        constraints:

          - node.role == worker

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

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

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

      resources: