Skip to content

Commit 39ff5f8

Browse files
authored
[localstack] Add testcontainer marker labels to additional localstack flags (#9531)
1 parent 1facaf0 commit 39ff5f8

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,10 @@ protected void configure() {
203203
@Override
204204
protected void containerIsStarting(InspectContainerResponse containerInfo) {
205205
String command = "#!/bin/bash\n";
206-
command += "export LAMBDA_DOCKER_FLAGS=" + configureLambdaContainerLabels() + "\n";
206+
command += "export LAMBDA_DOCKER_FLAGS=" + configureServiceContainerLabels("LAMBDA_DOCKER_FLAGS") + "\n";
207+
command += "export ECS_DOCKER_FLAGS=" + configureServiceContainerLabels("ECS_DOCKER_FLAGS") + "\n";
208+
command += "export EC2_DOCKER_FLAGS=" + configureServiceContainerLabels("EC2_DOCKER_FLAGS") + "\n";
209+
command += "export BATCH_DOCKER_FLAGS=" + configureServiceContainerLabels("BATCH_DOCKER_FLAGS") + "\n";
207210
command += "/usr/local/bin/docker-entrypoint.sh\n";
208211
copyFileToContainer(Transferable.of(command, 0777), STARTER_SCRIPT);
209212
}
@@ -214,13 +217,13 @@ protected void containerIsStarting(InspectContainerResponse containerInfo) {
214217
* chance.
215218
* @return the lambda container labels as a string
216219
*/
217-
private String configureLambdaContainerLabels() {
218-
String lambdaDockerFlags = internalMarkerLabels();
219-
String existingLambdaDockerFlags = getEnvMap().get("LAMBDA_DOCKER_FLAGS");
220-
if (existingLambdaDockerFlags != null) {
221-
lambdaDockerFlags = existingLambdaDockerFlags + " " + lambdaDockerFlags;
220+
private String configureServiceContainerLabels(String existingEnvFlagKey) {
221+
String internalMarkerFlags = internalMarkerLabels();
222+
String existingFlags = getEnvMap().get(existingEnvFlagKey);
223+
if (existingFlags != null) {
224+
internalMarkerFlags = existingFlags + " " + internalMarkerFlags;
222225
}
223-
return "\"" + lambdaDockerFlags + "\"";
226+
return "\"" + internalMarkerFlags + "\"";
224227
}
225228

226229
/**

0 commit comments

Comments
 (0)