Commit e1cdcad5 authored by Nacho's avatar Nacho
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/server/vessel/postgresql into dev

parents d8f01c56 66485192

docker-compose.dev.yml

+2 −2
Original line number Diff line number Diff line 
version: '3.5'



services:

  postgres:

    container_name: postgres

  postgresql:

    container_name: vessel-postgres

    restart: on-failure:3



volumes:

docker-compose.prod.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'



services:

  postgres:

  postgresql:

    deploy:

      mode: replicated

      replicas: 1

docker-compose.tmpl.yml

+1 −1
Original line number Diff line number Diff line 
version: '3.5'



services:

  postgres:

  postgresql:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - POSTGRES_PASSWORD

scripts/vessel.sh

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-E 
	  "callSign" text,

	  eta text,

	  PRIMARY KEY ("mmsi", "tstamp"),

	  CONSTRAINT "mmsi_date_last_position" UNIQUE ("mmsi", "tstamp")

	  CONSTRAINT "mmsi_date_last_week" UNIQUE ("mmsi", "tstamp")

	)

	WITH (

	  OIDS=FALSE