From 3a3ad650b9ccf5e4a2a4c3ccf8ec6c6196a8e3c4 Mon Sep 17 00:00:00 2001 From: mlm483 <128052931+mlm483@users.noreply.github.com> Date: Fri, 8 Dec 2023 12:17:14 -0500 Subject: [PATCH 1/3] [BI-1965-bugfix] - replaced deprecated env var --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 892309cb1..58fba6861 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -172,7 +172,7 @@ services: aliases: - localstack environment: - - HOSTNAME_EXTERNAL=localstack + - LOCALSTACK_HOST=localstack networks: backend: From 8e4477d28396e20a2102990abac1123aeb6c477b Mon Sep 17 00:00:00 2001 From: mlm483 <128052931+mlm483@users.noreply.github.com> Date: Fri, 8 Dec 2023 12:45:33 -0500 Subject: [PATCH 2/3] [BI-1965-bugfix] - replaced deprecated env var in test --- .../geno/impl/GigwaGenotypeServiceImplIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java b/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java index afa593e7c..7851d4427 100644 --- a/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java +++ b/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java @@ -251,7 +251,7 @@ public GigwaGenotypeServiceImplIntegrationTest() { .withServices(LocalStackContainer.Service.S3) .withNetwork(super.getNetwork()) .withNetworkAliases("localstack") - .withEnv("HOSTNAME_EXTERNAL", "localstack"); + .withEnv("LOCALSTACK_HOST", "localstack"); localStackContainer.start(); } From 38ef089a9b55a022d7ce2d35f9aa856464118bbf Mon Sep 17 00:00:00 2001 From: mlm483 <128052931+mlm483@users.noreply.github.com> Date: Fri, 8 Dec 2023 14:05:36 -0500 Subject: [PATCH 3/3] [BI-1965-bugfix] - pinned localstack image to 3.0.2 --- docker-compose.yml | 2 +- .../geno/impl/GigwaGenotypeServiceImplIntegrationTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 58fba6861..910cd1554 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -163,7 +163,7 @@ services: - gigwa_db localstack: container_name: "localstack" - image: localstack/localstack + image: localstack/localstack:3.0.2 restart: always ports: - "4566:4566" diff --git a/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java b/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java index 7851d4427..56b3c099b 100644 --- a/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java +++ b/src/test/java/org/breedinginsight/services/geno/impl/GigwaGenotypeServiceImplIntegrationTest.java @@ -247,7 +247,7 @@ public GigwaGenotypeServiceImplIntegrationTest() { gigwa.start(); localStackContainer = new LocalStackContainer(DockerImageName.parse("localstack/localstack") - .withTag("2.2.0")) + .withTag("3.0.2")) .withServices(LocalStackContainer.Service.S3) .withNetwork(super.getNetwork()) .withNetworkAliases("localstack")