Commit 33c73d18 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/postgres/postgresql!40
parents 499d9810 f3aa84ab

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ include: 
    ref: master

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

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

    ref: dev

    ref: master

    file: '/deployment-external-backup-postgresql.yml'

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

    ref: master
@@ -47,4 +47,4 @@ variables: 
.scheduled-run:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

    SERVICE: ${PROJECT_PARENT_NAME}_backup-db
 
    SERVICE: ${PROJECT_PARENT_NAME}_backup-postgresql

deploy/.env

+5 −1
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ PGDATA=/var/lib/postgresql/data/db-files 
POSTGRES_INITDB_WALDIR=/postgresql/wal/wal-files

DESIRED_WORKER_ID=a

PORT=5432



POSTGRES_NET_NAME=postgres-net

DATA_VOLUME_NAME=postgres-data-vol

WAL_VOLUME_NAME=postgres-wal-vol

POSTGRES_NET_NAME=postgres-net
 
VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

deploy/docker-compose.dev.yml

+4 −4
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ volumes: 
    name: ${DATA_VOLUME_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE:-nfs4}

      o: addr=${VOL_ADDR:-127.0.0.1},${VOL_OPTIONS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${DATA_VOL_DEVICE:-:/postgres-data-vol/}



  wal-vol:

    name: ${WAL_VOLUME_NAME}

    driver: local

    driver_opts:

      type: ${VOL_TYPE:-nfs4}

      o: addr=${VOL_ADDR:-127.0.0.1},${VOL_OPTIONS:-rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14}

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${WAL_VOL_DEVICE:-:/postgres-wal-vol/}