Commit 8c73bfb9 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Revisa sintaxis y nombres, añade stop_grace_period

parent 0901353e

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ RUN apt-get update && \ 
	localedef -i es_ES -c -f UTF-8 -A /usr/share/locale/locale.alias es_ES.UTF-8 && \

	mv /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-entrypoint-origin.sh && \

	mv /tmp/docker-entrypoint.sh /usr/local/bin/ && \

	mv /tmp/pg_hba.conf /usr/share/postgresql/${PG_MAJOR}/pg_hba.conf.sample

	mv /tmp/pg_hba.conf "/usr/share/postgresql/${PG_MAJOR}/pg_hba.conf.sample"



ENV LANG es_ES.utf8

deploy/.env

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

DESIRED_WORKER_ID=a

PORT=5432

POSTGRES_DATA_VOLUME_NAME=postgres-data-vol

POSTGRES_WAL_VOLUME_NAME=postgres-wal-vol

DATA_VOLUME_NAME=postgres-data-vol

WAL_VOLUME_NAME=postgres-wal-vol

POSTGRES_NET_NAME=postgres-net

deploy/docker-compose.dev.yml

+6 −6
Original line number Diff line number Diff line
@@ -12,18 +12,18 @@ services: 
          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}



volumes:

  postgres-data-vol:

    name: ${POSTGRES_DATA_VOLUME_NAME}

  data-vol:

    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}

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

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



  postgres-wal-vol:

    name: ${POSTGRES_WAL_VOLUME_NAME}

  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}

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

deploy/docker-compose.prod.yml

+6 −6
Original line number Diff line number Diff line
@@ -16,18 +16,18 @@ services: 
          memory: ${RESOURCES_RESERVATIONS_MEMORY:-512M}



volumes:

  postgres-data-vol:

    name: ${POSTGRES_DATA_VOLUME_NAME}

  data-vol:

    name: ${DATA_VOLUME_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: ${POSTGRES_DATA_VOLUME_SIZE:-20}

      size: ${DATA_VOLUME_SIZE:-20}

      ebstype: gp2



  postgres-wal-vol:

    name: ${POSTGRES_WAL_VOLUME_NAME}

  wal-vol:

    name: ${WAL_VOLUME_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: relocatable

      size: ${POSTGRES_WAL_VOLUME_SIZE:-10}

      size: ${WAL_VOLUME_SIZE:-10}

      ebstype: gp2

deploy/docker-compose.tmpl.yml

+4 −3
Original line number Diff line number Diff line
@@ -26,18 +26,19 @@ services: 
        aliases:

          - db

    volumes:

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

      - postgres-wal-vol:/postgresql/wal

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

      - wal-vol:/postgresql/wal

    configs:

      - source: mail-layout

        target: /home/REDMIC/Mail/dist/layout.mustache

    stop_grace_period: ${STOP_GRACE_PERIOD:-1m}

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}

      restart_policy:

        delay: ${RESTART_DELAY:-10s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}

        delay: ${UPDATE_DELAY:-2m}



networks:

  postgres-net: