Commit 409f4659 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza config de despliegue, replantea CI

See merge request redmic-project/postgres/postgresql!34
parents 43469a95 33ee23ad

.gitignore

deleted100644 → 0
+0 −0

Empty file deleted.

.gitlab-ci.yml

+33 −25
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ include: 
  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-custom-image.yml'

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/maintenance.yml'
@@ -16,14 +19,12 @@ stages: 
  - maintenance



variables:

  STACK: postgres

  PROJECT_PARENT_NAME: postgres



.deploy:

  script:

    - create-nets.sh postgres-net

    - >

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

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

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_${CI_PROJECT_NAME}



.deploy-development:

  variables:
@@ -40,21 +41,13 @@ variables: 
.deploy-backup:

  extends: .deploy

  variables:

    SERVICES_TO_CHECK: ${STACK}_backup-db

    IMAGE_NAME: ${POSTGRES_BACKUP_IMAGE_NAME}

    IMAGE_TAG: ${POSTGRES_BACKUP_IMAGE_TAG}

  script:

    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} 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}

    STACK: ${PROJECT_PARENT_NAME}

    SERVICES_TO_CHECK: ${PROJECT_PARENT_NAME}_backup-db

    DD_AWS_REGION: ${AWS_REGION}



.deploy-backup-development:

  extends: .deploy-backup

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

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

  environment:

    name: dev/backup-db
@@ -62,36 +55,51 @@ variables: 
.deploy-backup-production:

  extends: .deploy-backup

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

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

  environment:

    name: pro/backup-db



deploy-backup-support-branch-development:

  extends: .deploy-backup-development

.deploy-backup-support-branch: &deploy-backup-support-branch

  only:

    - branches

  except:

    - master

    - schedules



deploy-backup-stable-branch-development:

deploy-backup-support-branch-development:

  extends: .deploy-backup-development

  <<: *deploy-backup-support-branch



.deploy-backup-stable-branch: &deploy-backup-stable-branch

  only:

    - master

  except:

    - schedules



deploy-backup-stable-branch-development:

  extends: .deploy-backup-development

  <<: *deploy-backup-stable-branch



deploy-backup-stable-branch-production:

  extends: .deploy-backup-production

  <<: *deploy-backup-stable-branch



.deploy-backup-tag: &deploy-backup-tag

  only:

    - master

  except:

    - schedules

    - tags



deploy-backup-tag-development:

  extends: .deploy-backup-development

  <<: *deploy-backup-tag



deploy-backup-tag-production:

  extends: .deploy-backup-production

  <<: *deploy-backup-tag



.scheduled-run:

  variables:

    SERVICE: ${STACK}_backup-db

    STACK: ${PROJECT_PARENT_NAME}

    SERVICE: ${PROJECT_PARENT_NAME}_backup-db



scheduled-run-development:

  script: ':'

README.md

+6 −4
Original line number Diff line number Diff line 
# DATABASE



Este repositorio es para guardar los elementos necesarios para preparar la base de datos. Este README está por hacer.



Ejecutar fichero sql desde consola



```

```sh

psql -U username -d myDataBase -a -f myInsertFile

```



# Extraer el schema desde una base de datos

```

## Extraer el schema desde una base de datos



```sh

pg_dump -h redmic.es -U postgres -W --schema=app --schema-only -d redmic > app.sql

```

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

+9 −8
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ version: '3.5' 


services:

  backup-db:

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

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/postgres/backup-db}:${IMAGE_TAG:-latest}

    environment:

      POSTGRES_USER:

      POSTGRES_PASSWORD:
@@ -17,24 +17,25 @@ services: 
      metric-net:

    deploy:

      mode: replicated

      replicas: 1

      replicas: ${REPLICAS:-1}

      restart_policy:

        condition: on-failure

        delay: 30s

        window: 1m

        delay: ${RESTART_DELAY:-30s}

      resources:

        limits:

          cpus: '0.5'

          memory: 256M

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

        reservations:

          cpus: '0.001'

          memory: 64M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-64M}



networks:

  postgres-net:

    name: ${POSTGRES_NET_NAME}

    driver: ${POSTGRES_NET_DRIVER:-overlay}

    external: true



  metric-net:

    name: ${METRIC_NET_NAME:-metric-net}

    driver: ${METRIC_NET_DRIVER:-overlay}

    external: true

deploy/docker-compose.postgresql.dev.yml

+4 −8
Original line number Diff line number Diff line
@@ -2,18 +2,14 @@ version: '3.5' 


services:

  postgresql:

    ports:

      - target: ${PORT}

        published: ${PORT}

        mode: host

    deploy:

      resources:

        limits:

          cpus: '1'

          memory: 512M

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-512M}

        reservations:

          cpus: '0.001'

          memory: 128M

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}



volumes:

  postgres-data-vol: