Commit c0867ac3 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Generaliza props de deploy, permite renombrar vols

See merge request redmic-project/postgres/postgresql!27
parents 8d9d3847 2f43b37d

deploy/docker-compose.postgresql.dev.yml

+0 −13
Original line number Diff line number Diff line
@@ -7,22 +7,9 @@ services: 
        published: 5432

        mode: host

    deploy:

      mode: replicated

      replicas: 1

      restart_policy:

        condition: on-failure

        delay: 1m

        window: 3m

      resources:

        limits:

          cpus: '2'

          memory: 1G

        reservations:

          memory: 820M
 


volumes:

  postgres-data-vol:

    name: postgres-data-vol



  postgres-wal-vol:

    name: postgres-wal-vol

deploy/docker-compose.postgresql.prod.yml

+0 −8
Original line number Diff line number Diff line
@@ -3,16 +3,10 @@ version: '3.5' 
services:

  postgresql:

    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: '2'
@@ -22,7 +16,6 @@ services: 


volumes:

  postgres-data-vol:

    name: "postgres-data-vol"

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable
@@ -30,7 +23,6 @@ volumes: 
      ebstype: gp2



  postgres-wal-vol:

    name: "postgres-wal-vol"

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

deploy/docker-compose.postgresql.tmpl.yml

+13 −0
Original line number Diff line number Diff line
@@ -15,7 +15,20 @@ services: 
    volumes:

      - postgres-data-vol:/var/lib/postgresql/data

      - postgres-wal-vol:/postgresql/wal

    deploy:

      mode: replicated

      replicas: 1

      restart_policy:

        delay: 1m

        window: 3m



networks:

  postgres-net:

    external: true



volumes:

  postgres-data-vol:

    name: ${POSTGRES_DATA_VOLUME_NAME:-postgres-data-vol}



  postgres-wal-vol:

    name: ${POSTGRES_WAL_VOLUME_NAME:-postgres-wal-vol}