Commit 193debce authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Cambia worker constraint para usar variables AWS

See merge request redmic-project/postgres/backup-db!3
parents af47675a a9902a79

.env

+1 −1
Original line number Diff line number Diff line 
DESIRED_WORKER_ID=1
 
DESIRED_WORKER_ID=a

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ deploy-pro: 
  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

      AWS_REGION=${AWS_REGION} POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

      POSTGRES_HOSTNAME=${POSTGRES_HOSTNAME} BUCKET_BACKUP_DB=${BUCKET_BACKUP_DB}

      AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}

  environment:
@@ -150,7 +150,7 @@ scheduled-deploy-pro: 
  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

      AWS_REGION=${AWS_REGION} POSTGRES_USER=${POSTGRES_USER} POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

      POSTGRES_HOSTNAME=${POSTGRES_HOSTNAME} BUCKET_BACKUP_DB=${BUCKET_BACKUP_DB}

      AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}

  environment:

docker-compose.prod.yml

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

        constraints:

          - node.role == worker

          - node.labels.workerid == ${DESIRED_WORKER_ID}

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

      restart_policy:

        condition: on-failure

        max_attempts: 3