Merge pull request #84 from FinnStutzenstein/image

Use official postgres 11 image

database.env

@@ -1,3 +1,3 @@
-DB_USER=openslides
-DB_PASS=openslides
-DB_NAME=openslides
+POSTGRES_USER=openslides
+POSTGRES_PASSWORD=openslides
+POSTGRES_DB=openslides

dc.dev.yml

@@ -32,9 +32,7 @@ services:
             - postgresql
             - redis
     postgresql:
-        image: sameersbn/postgresql:10
-        labels:
-            org.openslides.role: "postgres"
+        image: postgres:11
         env_file: database.env
         networks:
             - postgresql

dc.prod.yml

@@ -24,9 +24,7 @@ services:
             - postgresql
             - redis
     postgresql:
-        image: sameersbn/postgresql:10
-        labels:
-            org.openslides.role: "postgres"
+        image: postgres:11
         env_file: database.env
         networks:
             - postgresql

dc.test.yml

@@ -38,9 +38,7 @@ services:
         networks:
             - postgresql
     postgresql:
-        image: sameersbn/postgresql:10
-        labels:
-            org.openslides.role: "postgres"
+        image: postgres:11
         env_file: database.env
         networks:
             - postgresql

docker-compose.yml

@@ -33,9 +33,7 @@ services:
             - postgresql
             - redis
     postgresql:
-        image: sameersbn/postgresql:10
-        labels:
-            org.openslides.role: "postgres"
+        image: postgres:11
         env_file: database.env
         networks:
             - postgresql

scripts/system/wait-for-database.sh

@@ -2,7 +2,10 @@
 
 source export-database-variables.sh
 
-wait-for-it -t 0 "$DATASTORE_DATABASE_HOST:$DATASTORE_DATABASE_PORT"
+until pg_isready -h "$DATASTORE_DATABASE_HOST" -p "$DATASTORE_DATABASE_PORT"; do
+  echo "Waiting for Postgres server '$DATASTORE_DATABASE_HOST' to become available..."
+  sleep 3
+done
 
 # Create schema in postgresql
 export PGPASSWORD="$DATASTORE_DATABASE_PASSWORD"