From dc5a7fddc815652ab524c395afbaead600b528cf Mon Sep 17 00:00:00 2001 From: johannesl Date: Sun, 14 Jul 2024 12:04:40 +0200 Subject: [PATCH] Fix file name --- tests/resources/docker-compose.yml | 7 ++++--- tests/resources/sirix-conf.json | 6 ------ 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 tests/resources/sirix-conf.json diff --git a/tests/resources/docker-compose.yml b/tests/resources/docker-compose.yml index d700b2c..f7c419b 100644 --- a/tests/resources/docker-compose.yml +++ b/tests/resources/docker-compose.yml @@ -17,7 +17,6 @@ services: --import-realm --http-relative-path=/ --hostname-strict=false - --proxy=edge networks: - auth-network healthcheck: @@ -30,9 +29,11 @@ services: ports: - 9443:9443 restart: always + depends_on: + keycloak: + condition: service_healthy volumes: - - /opt/sirix/sirix-data:/opt/sirix/sirix-data - - ./sirix-conf.json:/opt/sirix/sirix-conf.json + - ./sirix-docker-conf.json:/opt/sirix/sirix-docker-conf.json - ./logback-test.xml:/opt/sirix/sirix-data/logback-test.xml networks: - auth-network diff --git a/tests/resources/sirix-conf.json b/tests/resources/sirix-conf.json deleted file mode 100644 index bb2fcff..0000000 --- a/tests/resources/sirix-conf.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "use.http": true, - "port": 9443, - "keycloak.url": "http://keycloak:8080/realms/sirixdb", - "client.secret": "78a294c4-0492-4e44-a35f-7eb9cab0d831" -}