Commit f41b7a50 authored by Ignacio's avatar Ignacio
Browse files

Merge branch 'dev' into 'master' 

Reduce disco EBS a 10 Gb

See merge request redmic-project/server/recreation/postgresql!1
parents 83e8a830 3efaff53

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ stages: 
  - deploy



variables:

  STACK: recreation

  STACK: inspire



.deploy-development:

  variables:

deploy/.env

+1 −1
Original line number Diff line number Diff line 
PGDATA=/var/lib/postgresql/data/db-files/

POSTGRES_DB=recreation

POSTGRES_DB=inspire

POSTGRES_WORK_MEM=1GB

deploy/docker-compose.postgresql.dev.yml

+2 −2
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ services: 
          memory: 250M



volumes:

  recreation-postgres-vol:

    name: ${POSTGRES_DATA_VOLUME_NAME:-recreation-postgres-vol}
 
  inspire-postgres-vol:

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

deploy/docker-compose.postgresql.prod.yml

+3 −3
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ services: 
          memory: 250M



volumes:

  recreation-postgres-vol:

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

  inspire-postgres-vol:

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

    driver: "cloudstor:aws"

    driver_opts:

      backing: relocatable

      size: 50

      size: 10

      ebstype: gp2
 
 No newline at end of file

deploy/docker-compose.postgresql.tmpl.yml

+3 −3
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ services: 
    networks:

      gis-net:

        aliases:

          - recreation-db

          - inspire-db

      postgres-net:

        aliases:

          - recreation-db

          - inspire-db

    volumes:

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

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



networks:

  gis-net: