From 2ecec6dd22916c3de8738eea124cbe8c1618cc60 Mon Sep 17 00:00:00 2001 From: Daniel Fangl Date: Mon, 18 Nov 2024 14:05:35 +0100 Subject: [PATCH 1/2] Add testcontainer labels to additional service flags as well --- .../localstack/LocalStackContainer.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java index b9a88e96102..51b4e881282 100644 --- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java +++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java @@ -203,7 +203,10 @@ protected void configure() { @Override protected void containerIsStarting(InspectContainerResponse containerInfo) { String command = "#!/bin/bash\n"; - command += "export LAMBDA_DOCKER_FLAGS=" + configureLambdaContainerLabels() + "\n"; + command += "export LAMBDA_DOCKER_FLAGS=" + configureServiceContainerLabels("LAMBDA_DOCKER_FLAGS") + "\n"; + command += "export ECS_DOCKER_FLAGS=" + configureServiceContainerLabels("ECS_DOCKER_FLAGS") + "\n"; + command += "export EC2_DOCKER_FLAGS=" + configureServiceContainerLabels("EC2_DOCKER_FLAGS") + "\n"; + command += "export BATCH_DOCKER_FLAGS=" + configureServiceContainerLabels("BATCH_DOCKER_FLAGS") + "\n"; command += "/usr/local/bin/docker-entrypoint.sh\n"; copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT); } @@ -214,13 +217,13 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) { * chance. * @return the lambda container labels as a string */ - private String configureLambdaContainerLabels() { - String lambdaDockerFlags = internalMarkerLabels(); - String existingLambdaDockerFlags = getEnvMap().get("LAMBDA_DOCKER_FLAGS"); - if (existingLambdaDockerFlags != null) { - lambdaDockerFlags = existingLambdaDockerFlags + " " + lambdaDockerFlags; + private String configureServiceContainerLabels(String existingEnvFlagKey) { + String internalMarkerFlags = internalMarkerLabels(); + String existingFlags = getEnvMap().get(existingEnvFlagKey); + if (existingFlags != null) { + internalMarkerFlags = existingFlags + " " + internalMarkerFlags; } - return "\"" + lambdaDockerFlags + "\""; + return "\"" + internalMarkerFlags + "\""; } /** From aa299fe4eb661299c12732054dd596be2bcdbd75 Mon Sep 17 00:00:00 2001 From: Daniel Fangl Date: Mon, 18 Nov 2024 14:23:22 +0100 Subject: [PATCH 2/2] Fix linter --- .../containers/localstack/LocalStackContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java index 51b4e881282..fb7d383898a 100644 --- a/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java +++ b/modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java @@ -221,9 +221,9 @@ private String configureServiceContainerLabels(String existingEnvFlagKey) { String internalMarkerFlags = internalMarkerLabels(); String existingFlags = getEnvMap().get(existingEnvFlagKey); if (existingFlags != null) { - internalMarkerFlags = existingFlags + " " + internalMarkerFlags; + internalMarkerFlags = existingFlags + " " + internalMarkerFlags; } - return "\"" + internalMarkerFlags + "\""; + return "\"" + internalMarkerFlags + "\""; } /**