Commit 3a077472 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Delega deploy y planificación

See merge request redmic-project/postgres/backup-db!5
parents f0af2e2f 2843767c

.gitlab-ci.yml

+2 −120
Original line number Diff line number Diff line 
stages:

  - package

  - test-package

  - deploy



image: docker:stable



variables:

  DOCKER_DRIVER: overlay2
@@ -11,7 +12,6 @@ services: 


docker-build-commit-non-master-branches:

  stage: package

  image: docker:stable

  only:

    - branches

  except:
@@ -24,7 +24,6 @@ docker-build-commit-non-master-branches: 


docker-build-commit-master-branch:

  stage: package

  image: docker:stable

  only:

    - master

  except:
@@ -36,7 +35,6 @@ docker-build-commit-master-branch: 


docker-tag-already-built-image:

  stage: package

  image: docker:stable

  only:

    - tags

  except:
@@ -48,7 +46,6 @@ docker-tag-already-built-image: 


container-scanning:

  stage: test-package

  image: docker:stable

  allow_failure: true

  only:

    - branches
@@ -69,118 +66,3 @@ container-scanning: 
      -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} || true

  artifacts:

    paths: [gl-sast-container-report.json]
 


deploy-dev:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: postgres

    SERVICES_TO_CHECK: postgres_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    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}

  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}

  environment:

    name: dev

  only:

    - dev

  except:

    - schedules

  when: manual



deploy-supporting-branch:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: postgres

    SERVICES_TO_CHECK: postgres_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    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}

  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}

  environment:

    name: dev

  only:

    - branches

  except:

    - master

    - dev

    - schedules

  when: manual



deploy-pro:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: postgres

    SERVICES_TO_CHECK: postgres_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    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}

  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}

  environment:

    name: pro

  only:

    - master

  except:

    - schedules

  when: manual



scheduled-deploy-pro:

  stage: deploy

  image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: postgres

    SERVICES_TO_CHECK: postgres_${CI_PROJECT_NAME}

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

  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}

  environment:

    name: pro

  only:

    - master

    - schedules

deploy/.env

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
DESIRED_WORKER_ID=a

deploy/docker-compose.dev.yml

deleted100644 → 0
+0 −17
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.prod.yml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
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.tmpl.yml

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
version: '3.5'



services:

  backup-db:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - POSTGRES_USER

      - POSTGRES_PASSWORD

      - POSTGRES_HOSTNAME

      - BUCKET_BACKUP_DB

      - AWS_ACCESS_KEY_ID

      - AWS_SECRET_ACCESS_KEY

    networks:

      - postgres-net



networks:

  postgres-net:

    external: true

.dockerignore

+1 −1

File changed.

Contains only whitespace changes.