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
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<quarkus.package.main-class>dev.streamx.cli.StreamxCommand</quarkus.package.main-class>

<!-- this should not be overridden by user, same as streamx runner dependencies -->
<streamx.dev.dashboard.image>ghcr.io/streamx-dev/streamx-dashboard/streamx-local-dashboard:0.0.7-patch002-jvm</streamx.dev.dashboard.image>
<streamx.dev.dashboard.image>ghcr.io/streamx-dev/streamx-dashboard/streamx-local-dashboard:0.0.8-jvm</streamx.dev.dashboard.image>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import jakarta.enterprise.event.Event;
import jakarta.inject.Inject;
import java.time.Duration;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.wait.strategy.Wait;

@ApplicationScoped
public class DashboardRunner {
Expand All @@ -25,14 +27,15 @@ public class DashboardRunner {
private DashboardContainer dashboardContainer;

public void startStreamxDashboard(String meshPath, String meshDirectory,
String projectDirectory) {
String projectDirectory, Network network) {
dashboardContainer = new DashboardContainer(
StreamxMavenPropertiesUtils.getDashboardImage(),
devConfig.dashboardPort(),
meshPath,
meshDirectory,
projectDirectory
).withStartupTimeout(Duration.ofSeconds(CONTAINER_TIMEOUT_IN_SECS));
).withStartupTimeout(Duration.ofSeconds(CONTAINER_TIMEOUT_IN_SECS))
.withNetwork(network);
dashboardContainer.start();

print("StreamX Dashboard started on http://localhost:" + devConfig.dashboardPort());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public void run() {
Files.createFile(meshPath);
}

this.runner.initializeBase();
startDashboard(meshPath);

meshManager.initializeDevMode(meshPath, spec.commandLine());
Expand Down Expand Up @@ -125,7 +126,10 @@ private void startDashboard(Path meshPath) {

logger.infov("Resolved mesh {0}, mesh directory {1} and project directory {2}",
meshPathAsString, meshDirectoryAsString, projectDirectoryAsString);
dashboardRunner.startStreamxDashboard(meshPathAsString, meshDirectoryAsString,
projectDirectoryAsString);
dashboardRunner.startStreamxDashboard(
meshPathAsString,
meshDirectoryAsString,
projectDirectoryAsString,
runner.getContext().getNetwork());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ public void initializeDevMode(Path meshPath, CommandLine commandLine) {

print("\nSetting up system containers...");

this.runner.initializeBase();
Comment thread
jgardo-ds marked this conversation as resolved.
this.runner.startBase();
}

Expand Down