Commit 7600642e authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Añade config en CI para pasar variables de metrics

See merge request redmic-project/postgres/postgresql!29
parents 930e8044 1e9bdbce

.gitlab-ci.yml

+15 −6
Original line number Diff line number Diff line
@@ -160,12 +160,15 @@ 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}

    PUSHGATEWAY_HOST: ${PUSHGATEWAY_HOST}

    PUSHGATEWAY_JOB: ${PUSHGATEWAY_JOB}

  script:

    - >

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

      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}

      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}

      PUSHGATEWAY_HOST=${PUSHGATEWAY_HOST} PUSHGATEWAY_JOB=${PUSHGATEWAY_JOB}

  environment:

    name: dev/backup-db

  only:
@@ -190,12 +193,15 @@ 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}

    PUSHGATEWAY_HOST: ${PUSHGATEWAY_HOST}

    PUSHGATEWAY_JOB: ${PUSHGATEWAY_JOB}

  script:

    - >

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

      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}

      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}

      PUSHGATEWAY_HOST=${PUSHGATEWAY_HOST} PUSHGATEWAY_JOB=${PUSHGATEWAY_JOB}

  environment:

    name: dev/backup-db

  only:
@@ -223,12 +229,15 @@ deploy-backup-pro: 
    BUCKET_BACKUP_DB: ${BUCKET_BACKUP_DB}

    AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}

    AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}

    PUSHGATEWAY_HOST: ${PUSHGATEWAY_HOST}

    PUSHGATEWAY_JOB: ${PUSHGATEWAY_JOB}

  script:

    - >

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

      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}

      PUSHGATEWAY_HOST=${PUSHGATEWAY_HOST} PUSHGATEWAY_JOB=${PUSHGATEWAY_JOB}

  environment:

    name: pro/backup-db

  only:

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

+0 −16
Original line number Diff line number Diff line 
version: '3.5'
 


services:

  backup-db:

    deploy:

      mode: replicated

      replicas: 1

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M

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

+1 −12
Original line number Diff line number Diff line
@@ -3,19 +3,8 @@ version: '3.5' 
services:

  backup-db:

    deploy:

      mode: replicated

      replicas: 1

      placement:

        constraints:

          - node.role == worker

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

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M

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

+18 −0
Original line number Diff line number Diff line
@@ -10,9 +10,27 @@ services: 
      - BUCKET_BACKUP_DB

      - AWS_ACCESS_KEY_ID

      - AWS_SECRET_ACCESS_KEY

      - PUSHGATEWAY_HOST

      - PUSHGATEWAY_JOB

    networks:

      - postgres-net

      - metric-net

    deploy:

      mode: replicated

      replicas: 1

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '0.5'

          memory: 512M

        reservations:

          memory: 410M



networks:

  postgres-net:

    external: true

  metric-net:

    external: true