Commit d892c9af authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Añade variable para setear work_mem

See merge request redmic-project/server/vessel/postgresql!23
parents dd17b412 5b7d3db1

.gitlab-ci.yml

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ variables: 
      MAINTENANCE_INTERVAL_MINUTE="${MAINTENANCE_INTERVAL_MINUTE}" MAINTENANCE_INTERVAL_HOUR="${MAINTENANCE_INTERVAL_HOUR}"

      MAINTENANCE_INTERVAL_DAY_OF_MONTH="${MAINTENANCE_INTERVAL_DAY_OF_MONTH}" MAINTENANCE_INTERVAL_MONTH="${MAINTENANCE_INTERVAL_MONTH}"

      MAINTENANCE_INTERVAL_DAY_OF_WEEK="${MAINTENANCE_INTERVAL_DAY_OF_WEEK}" RETENTION_TIME="${RETENTION_TIME}"

      POSTGRES_WORK_MEM=${POSTGRES_WORK_MEM}

  environment:

    name: dev/${CI_PROJECT_NAME}
@@ -41,7 +42,7 @@ variables: 
      MAINTENANCE_INTERVAL_MINUTE="${MAINTENANCE_INTERVAL_MINUTE}" MAINTENANCE_INTERVAL_HOUR="${MAINTENANCE_INTERVAL_HOUR}"

      MAINTENANCE_INTERVAL_DAY_OF_MONTH="${MAINTENANCE_INTERVAL_DAY_OF_MONTH}" MAINTENANCE_INTERVAL_MONTH="${MAINTENANCE_INTERVAL_MONTH}"

      MAINTENANCE_INTERVAL_DAY_OF_WEEK="${MAINTENANCE_INTERVAL_DAY_OF_WEEK}" RETENTION_TIME="${RETENTION_TIME}"

      AWS_REGION=${AWS_REGION}

      POSTGRES_WORK_MEM=${POSTGRES_WORK_MEM} AWS_REGION=${AWS_REGION}

  environment:

    name: pro/${CI_PROJECT_NAME}

Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ FROM mdillon/postgis:11-alpine 
LABEL maintainer="info@redmic.es"



ENV PG_CRON_VERSION="1.1.4" \

	PG_PARTMAN_VERSION="4.0.0"

	PG_PARTMAN_VERSION="4.0.0" \

	POSTGRES_WORK_MEM="1GB"



RUN apk add --no-cache --virtual \

		.build-deps \

deploy/.env

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ INTERVAL=hourly 
MAINTENANCE_INTERVAL=30 * * * *

RETENTION_TIME=7 days

POSTGRES_DB=ais

POSTGRES_WORK_MEM=1GB

deploy/docker-compose.postgresql.tmpl.yml

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ services: 
      - POSTGRES_DB

      - POSTGRES_PASSWORD

      - POSTGRES_USER

      - POSTGRES_WORK_MEM

      - PGDATA

      - INTERVAL

      - MAINTENANCE_INTERVAL_MINUTE

rootfs/usr/local/bin/docker-entrypoint.sh

+1 −0
Original line number Diff line number Diff line 
#!/bin/sh



echo "work_mem=${POSTGRES_WORK_MEM}" >> /usr/local/share/postgresql/postgresql.conf.sample

echo "cron.database_name='${POSTGRES_DB}'" >> /usr/local/share/postgresql/postgresql.conf.sample



exec docker-entrypoint-origin.sh "$@"