Unify flyway schemas and fix PostgreSQL v1_12_35 (#2906)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

docker/postgres/docker-compose-deps-postgres.yml

@@ -21,11 +21,11 @@ services:
       restart_policy:
         condition: on-failure
     environment:
+      POSTGRES_DB: "hawkbit"
       POSTGRES_USER: "postgres"
       POSTGRES_PASSWORD: "admin"
-      POSTGRES_DB: "hawkbit"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${POSTGRES_USER}"]
+      test: ["CMD-SHELL", "pg_isready -d ${POSTGRES_DB:-hawkbit} -U ${POSTGRES_USER:-postgres}"]
       interval: 20s
       retries: 10
 
@@ -44,5 +44,4 @@ services:
       - "5672:5672"
     deploy:
       restart_policy:
-        condition: on-failure
-
+        condition: on-failure