Commit 812da413 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Aumenta RAM y define reserva de CPU

See merge request redmic-project/server/vessel/postgresql!20
parents ef0af250 0f691146

deploy/docker-compose.postgresql.prod.yml

+4 −3
Original line number Diff line number Diff line
@@ -13,10 +13,11 @@ services: 
        window: 3m

      resources:

        limits:

          cpus: '0.75'

          memory: 1G

          cpus: 1

          memory: 2G

        reservations:

          memory: 820M

          cpus: '0.01'

          memory: 512M



volumes:

  vessel-postgres-vol:

deploy/docker-compose.postgresql.tmpl.yml

+8 −0
Original line number Diff line number Diff line
@@ -19,9 +19,17 @@ services: 
      postgres-vessel-net:

        aliases:

          - ais-db

      gis-net:

        aliases:

          - ais-db

    volumes:

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



networks:

  postgres-vessel-net:

    name: ${POSTGRES_NET_NAME:-postgres-vessel-net}

    attachable: true



  gis-net:

    name: ${GIS_NET_NAME:-gis-net}

    external: true
 
 No newline at end of file

rootfs/docker-entrypoint-initdb.d/vessel.sh

+1 −2
Original line number Diff line number Diff line
@@ -132,8 +132,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E 
	WHEN TAG IN ('CREATE TABLE')

	EXECUTE PROCEDURE on_create_table_create_trigger();



	SELECT partman.create_parent('ais.location', 'tstamp', 'native', '${INTERVAL}',

		p_premake := 3, p_automatic_maintenance := 'off');

	SELECT partman.create_parent('ais.location', 'tstamp', 'native', '${INTERVAL}', p_premake := 3);



	UPDATE partman.part_config

	SET infinite_time_partitions = true,