Merge branch 'main' into new-network-initialize-method

testcontainers · Nov 22, 2024 · a71f7cc · a71f7cc
2 parents 434b522 + f7267c7
commit a71f7cc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2g
 
-testcontainers.version=1.20.3
+testcontainers.version=1.20.4
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -136,4 +136,4 @@ nav:
           - bounty.md
 edit_uri: edit/main/docs/
 extra:
-    latest_version: 1.20.3
+    latest_version: 1.20.4
diff --git a/...ocalstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java b/...ocalstack/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 + "\"";
     }
 
     /**