Updated the init image

Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>

dbrepo-dashboard-service/init/app.py

@@ -53,9 +53,9 @@ def fetch_databases() -> List[Database]:
 
 
 def upsert_dashboard(database: Database) -> None:
-    db = dashboard_client().find(database.dashboard_uid)['dashboard']
+    db = dashboard_client().find(database.dashboard_uid)
     if db is None:
-        db = dashboard_client().create(database.internal_name, database.dashboard_uid)['dashboard']
+        db = dashboard_client().create(database.internal_name, database.dashboard_uid)
         rest_client().update_database_dashboard(database.id, db['uid'])
         return
     dashboard_client().update(database)

dbrepo-metadata-db/migration/17/schema.sql

+ALTER TABLE mdb_containers
+    DROP SYSTEM VERSIONING;
+ALTER TABLE mdb_containers
+    ADD COLUMN readonly_username VARCHAR(255) NOT NULL;
+ALTER TABLE mdb_containers
+    ADD COLUMN readonly_password VARCHAR(255) NOT NULL;
+ALTER TABLE mdb_containers
+    ADD SYSTEM VERSIONING;
+
+ALTER TABLE mdb_databases
+    DROP SYSTEM VERSIONING;
+ALTER TABLE mdb_databases
+    ADD COLUMN grafana_dashboard_uid character varying(255);
+ALTER TABLE mdb_databases
+    ADD COLUMN is_dashboard_enabled BOOLEAN NOT NULL DEFAULT TRUE;
+ALTER TABLE mdb_databases
+    ADD SYSTEM VERSIONING;
\ No newline at end of file

docker-compose.yml

@@ -99,6 +99,7 @@ services:
       KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}"
       KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}"
       KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}"
+      KEYCLOAK_HOSTNAME: "http://localhost"
       METADATA_SERVICE_ENDPOINT: "${METADATA_SERVICE_ENDPOINT:-http://metadata-service:8080}"
       SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
       SYSTEM_PASSWORD: "${SYSTEM_PASSWORD:-admin}"