Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ public interface ContainerConstants {
String DAPR_PLACEMENT_IMAGE_TAG = DaprContainerConstants.DAPR_PLACEMENT_IMAGE_TAG;
String DAPR_SCHEDULER_IMAGE_TAG = DaprContainerConstants.DAPR_SCHEDULER_IMAGE_TAG;
String TOXI_PROXY_IMAGE_TAG = "ghcr.io/shopify/toxiproxy:2.5.0";
String JDK_17_TEMURIN_JAMMY = "eclipse-temurin:17-jdk-jammy";
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

package io.dapr.it.testcontainers.workflows.multiapp;

import io.dapr.it.testcontainers.ContainerConstants;
import io.dapr.testcontainers.Component;
import io.dapr.testcontainers.DaprContainer;
import io.dapr.testcontainers.DaprLogLevel;
Expand Down Expand Up @@ -113,7 +114,7 @@ public class WorkflowsMultiAppCallActivityIT {

// TestContainers for each app
@Container
private static GenericContainer<?> multiappWorker = new GenericContainer<>("openjdk:17-jdk-slim")
private static GenericContainer<?> multiappWorker = new GenericContainer<>(ContainerConstants.JDK_17_TEMURIN_JAMMY)
.withCopyFileToContainer(MountableFile.forHostPath("target"), "/app")
.withWorkingDirectory("/app")
.withCommand("java", "-cp", "test-classes:classes:dependency/*:*",
Expand All @@ -127,7 +128,7 @@ public class WorkflowsMultiAppCallActivityIT {
.withLogConsumer(outputFrame -> System.out.println("MultiAppWorker: " + outputFrame.getUtf8String()));

@Container
private final static GenericContainer<?> app2Worker = new GenericContainer<>("openjdk:17-jdk-slim")
private final static GenericContainer<?> app2Worker = new GenericContainer<>(ContainerConstants.JDK_17_TEMURIN_JAMMY)
.withCopyFileToContainer(MountableFile.forHostPath("target"), "/app")
.withWorkingDirectory("/app")
.withCommand("java", "-cp", "test-classes:classes:dependency/*:*",
Expand All @@ -141,7 +142,7 @@ public class WorkflowsMultiAppCallActivityIT {
.withLogConsumer(outputFrame -> System.out.println("App2Worker: " + outputFrame.getUtf8String()));

@Container
private final static GenericContainer<?> app3Worker = new GenericContainer<>("openjdk:17-jdk-slim")
private final static GenericContainer<?> app3Worker = new GenericContainer<>(ContainerConstants.JDK_17_TEMURIN_JAMMY)
.withCopyFileToContainer(MountableFile.forHostPath("target"), "/app")
.withWorkingDirectory("/app")
.withCommand("java", "-cp", "test-classes:classes:dependency/*:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public GenericContainer<?> workerOneContainer(Network daprNetwork,
@Qualifier("workerOneDapr") DaprContainer workerOneDapr,
DaprPlacementContainer daprPlacementContainer,
DaprSchedulerContainer daprSchedulerContainer){
return new GenericContainer<>("openjdk:17-jdk-slim")
return new GenericContainer<>(DockerImages.JDK_17_TEMURIN_JAMMY)
.withCopyFileToContainer(MountableFile.forHostPath("../worker-one/target"), "/app")
.withWorkingDirectory("/app")
.withCommand("java",
Expand Down Expand Up @@ -165,7 +165,7 @@ public GenericContainer<?> workerTwoContainer(Network daprNetwork,
@Qualifier("workerTwoDapr") DaprContainer workerTwoDapr,
DaprPlacementContainer daprPlacementContainer,
DaprSchedulerContainer daprSchedulerContainer){
return new GenericContainer<>("openjdk:17-jdk-slim")
return new GenericContainer<>(DockerImages.JDK_17_TEMURIN_JAMMY)
.withCopyFileToContainer(MountableFile.forHostPath("../worker-two/target"), "/app")
.withWorkingDirectory("/app")
.withCommand("java",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package io.dapr.springboot.examples.orchestrator;

public interface DockerImages {

String JDK_17_TEMURIN_JAMMY = "eclipse-temurin:17-jdk-jammy";
}
Loading