From 393752ab936416739a6a6c33eaea160a0bd5885f Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 1 Feb 2024 11:06:59 -0500 Subject: [PATCH 1/2] Reuse test containers during integration tests --- scripts/integration-tests.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/integration-tests.sh b/scripts/integration-tests.sh index 4d5fa338..e3990fe6 100755 --- a/scripts/integration-tests.sh +++ b/scripts/integration-tests.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash set -e +rm ~/.testcontainers.properties +echo 'testcontainers.reuse.enable=true' > ~/.testcontainers.properties + ./mvnw clean install -B -Pdocs ${@} +rm ~/.testcontainers.properties +docker kill $(docker ps -q) From cefacab1299c9ef876ee3796233d7e653853a4a3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 1 Feb 2024 18:24:18 +0000 Subject: [PATCH 2/2] Bumping versions --- README.adoc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.adoc b/README.adoc index 1b5a3b08..8491ba8d 100644 --- a/README.adoc +++ b/README.adoc @@ -38,6 +38,9 @@ provide implementations using the https://github.com/fabric8io/kubernetes-client Starters that begin with `spring-cloud-starter-kubernetes-client` provide implementations using the https://github.com/kubernetes-client/java[Kubernetes Java Client]. +NOTE: You CANNOT combine starters from Fabric8 and Kubernetes Java Clients. You must pick one library to +use and use the starters for that library only. + [cols="a,d"] |=== | Starter | Features