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

Merge branch 'dev' into 'master' 

Retoca detalles de despliegue para nueva versión

See merge request redmic-project/postgres/pgadmin!7
parents 4f0be059 edee9ee1

deploy/.env

+2 −1
Original line number Diff line number Diff line 
PGADMIN_LISTEN_PORT=5050

PGADMIN_LISTEN_PORT=80

PGADMIN_DEFAULT_EMAIL=postgres

PGADMIN_DEFAULT_PASSWORD=password

PGADMIN_DISABLE_POSTFIX=True

PGADMIN_CONFIG_MAIL_SERVER=smtp

PGADMIN_CONFIG_MAIL_PORT=25

PGADMIN_CONFIG_MAIL_USE_SSL=False

deploy/docker-compose.dev.yml

+2 −2
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ volumes: 
    name: ${PGADMIN_VOL_NAME}

    driver: local

    driver_opts:

      type: ${PGADMIN_VOL_TYPE:-nfs4}

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

      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: ${PGADMIN_VOL_DEVICE:-:/pgadmin-vol/}

deploy/docker-compose.tmpl.yml

+4 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ services: 
      PGADMIN_LISTEN_PORT:

      PGADMIN_DEFAULT_EMAIL:

      PGADMIN_DEFAULT_PASSWORD:

      PGADMIN_DISABLE_POSTFIX:

      PGADMIN_CONFIG_MAIL_SERVER: '''${PGADMIN_CONFIG_MAIL_SERVER}'''

      PGADMIN_CONFIG_MAIL_PORT:

      PGADMIN_CONFIG_MAIL_USE_SSL:
@@ -32,11 +33,11 @@ services: 
        delay: ${UPDATE_DELAY:-1m}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-128M}

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-103M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}



networks:

  postgres-net: