Commit 8a6de6b4 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza entornos de despliegue

See merge request redmic-project/postgres/postgresql!25
parents 7aee7573 a62d1044

.gitlab-ci.yml

+6 −8
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ deploy-dev: 
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

  environment:

    name: dev

    name: dev/postgresql

  only:

    - dev

  except:
@@ -110,7 +110,7 @@ deploy-supporting-branch: 
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      POSTGRES_PASSWORD=${POSTGRES_PASSWORD}

  environment:

    name: dev

    name: dev/postgresql

  only:

    - branches

  except:
@@ -137,7 +137,7 @@ deploy-pro: 
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

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

  environment:

    name: prod

    name: pro/postgresql

  only:

    - master

  except:
@@ -167,7 +167,7 @@ deploy-backup-dev: 
      BUCKET_BACKUP_DB=${BUCKET_BACKUP_DB} AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}

      AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}

  environment:

    name: dev

    name: dev/backup-db

  only:

    - dev

  except:
@@ -197,7 +197,7 @@ deploy-backup-supporting-branch: 
      BUCKET_BACKUP_DB=${BUCKET_BACKUP_DB} AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}

      AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}

  environment:

    name: dev

    name: dev/backup-db

  only:

    - branches

  except:
@@ -230,7 +230,7 @@ deploy-backup-pro: 
      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:

    name: pro

    name: pro/backup-db

  only:

    - master

  except:
@@ -245,7 +245,5 @@ scheduled-backup-pro: 
    SERVICE: postgres_backup-db

  script:

    - relaunch.sh

  environment:

    name: pro

  only:

    - schedules