From 0adcc62211f7192f481cc108cc08d04593a64f8a Mon Sep 17 00:00:00 2001 From: Alexander Kiel Date: Fri, 14 Jun 2024 12:44:34 +0200 Subject: [PATCH] Update Blaze to v0.27 --- .github/integration-test/basic-auth/docker-compose.yml | 2 +- .github/integration-test/no-auth/docker-compose.yml | 2 +- .github/integration-test/oauth/docker-compose.yml | 2 +- .github/workflows/build.yml | 2 +- docker-compose.yml | 2 +- .../medizininformatikinitiative/flare/service/DataStoreIT.java | 2 +- .../flare/service/StructuredQueryServiceIT.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/integration-test/basic-auth/docker-compose.yml b/.github/integration-test/basic-auth/docker-compose.yml index 29d1525..e394c2d 100644 --- a/.github/integration-test/basic-auth/docker-compose.yml +++ b/.github/integration-test/basic-auth/docker-compose.yml @@ -1,6 +1,6 @@ services: data-store: - image: "samply/blaze:0.26.2" + image: "samply/blaze:0.27" healthcheck: test: ["CMD-SHELL", "curl --fail -s http://localhost:8080/health"] interval: "5s" diff --git a/.github/integration-test/no-auth/docker-compose.yml b/.github/integration-test/no-auth/docker-compose.yml index 7aaaf5a..473a056 100644 --- a/.github/integration-test/no-auth/docker-compose.yml +++ b/.github/integration-test/no-auth/docker-compose.yml @@ -1,6 +1,6 @@ services: data-store: - image: "samply/blaze:0.26.2" + image: "samply/blaze:0.27" healthcheck: test: ["CMD-SHELL", "curl --fail -s http://localhost:8080/health"] interval: "5s" diff --git a/.github/integration-test/oauth/docker-compose.yml b/.github/integration-test/oauth/docker-compose.yml index 0ff80ac..70e1deb 100644 --- a/.github/integration-test/oauth/docker-compose.yml +++ b/.github/integration-test/oauth/docker-compose.yml @@ -72,7 +72,7 @@ services: keycloak: condition: service_healthy data-store: - image: "samply/blaze:0.26.2" + image: "samply/blaze:0.27" healthcheck: test: ["CMD-SHELL", "curl --fail -s http://localhost:8080/health"] interval: "5s" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bdfd2d2..bfdc32c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: - main - develop tags: - - '*.*.*' + - 'v*.*.*' pull_request: branches: - main diff --git a/docker-compose.yml b/docker-compose.yml index c4a5e78..c7d8b44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: data-store: - image: "samply/blaze:0.26" + image: "samply/blaze:0.27" environment: BASE_URL: "http://localhost:8082" JAVA_TOOL_OPTIONS: "-Xmx1g" diff --git a/src/test/java/de/medizininformatikinitiative/flare/service/DataStoreIT.java b/src/test/java/de/medizininformatikinitiative/flare/service/DataStoreIT.java index c0126a8..d9b856f 100644 --- a/src/test/java/de/medizininformatikinitiative/flare/service/DataStoreIT.java +++ b/src/test/java/de/medizininformatikinitiative/flare/service/DataStoreIT.java @@ -35,7 +35,7 @@ class DataStoreIT { @Container @SuppressWarnings("resource") - private final GenericContainer blaze = new GenericContainer<>("samply/blaze:0.26") + private final GenericContainer blaze = new GenericContainer<>("samply/blaze:0.27") .withImagePullPolicy(PullPolicy.alwaysPull()) .withEnv("LOG_LEVEL", "debug") .withExposedPorts(8080) diff --git a/src/test/java/de/medizininformatikinitiative/flare/service/StructuredQueryServiceIT.java b/src/test/java/de/medizininformatikinitiative/flare/service/StructuredQueryServiceIT.java index 5743b59..a5c84dc 100644 --- a/src/test/java/de/medizininformatikinitiative/flare/service/StructuredQueryServiceIT.java +++ b/src/test/java/de/medizininformatikinitiative/flare/service/StructuredQueryServiceIT.java @@ -60,7 +60,7 @@ class StructuredQueryServiceIT { @Container @SuppressWarnings("resource") - private static final GenericContainer blaze = new GenericContainer<>("samply/blaze:0.26") + private static final GenericContainer blaze = new GenericContainer<>("samply/blaze:0.27") .withImagePullPolicy(PullPolicy.alwaysPull()) .withEnv("LOG_LEVEL", "debug") .withEnv("DB_SEARCH_PARAM_BUNDLE", "/app/custom-search-parameters.json")