Do not add -i argument when unfederated

lf-lang · Jun 14, 2024 · 73d6915 · 73d6915
1 parent c8cb503
commit 73d6915
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/core/src/main/java/org/lflang/generator/docker/CDockerGenerator.java b/core/src/main/java/org/lflang/generator/docker/CDockerGenerator.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import org.lflang.LocalStrings;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.generator.SubContext;
 import org.lflang.generator.c.CCompiler;
 import org.lflang.target.Target;
 
@@ -56,7 +57,11 @@ protected String generateDockerFileContent() {
 
   @Override
   public List<String> defaultEntryPoint() {
-    return List.of("./bin/" + context.getFileConfig().name, "-i", "1");
+    if (context instanceof SubContext) {
+      return List.of("./bin/" + context.getFileConfig().name, "-i", "1");
+    } else {
+      return List.of("./bin/" + context.getFileConfig().name);
+    }
   }
 
   @Override

diff --git a/core/src/main/java/org/lflang/generator/docker/DockerComposeGenerator.java b/core/src/main/java/org/lflang/generator/docker/DockerComposeGenerator.java
@@ -46,7 +46,6 @@ protected String generateDockerNetwork(String networkName) {
    */
   protected String generateDockerServices(List<DockerData> services) {
     return """
-           version: "3.9"
            services:
            %s
            """

diff --git a/core/src/main/java/org/lflang/generator/docker/TSDockerGenerator.java b/core/src/main/java/org/lflang/generator/docker/TSDockerGenerator.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import org.lflang.generator.LFGeneratorContext;
+import org.lflang.generator.SubContext;
 
 /**
  * Generates the docker file related code for the Typescript target.
@@ -29,7 +30,11 @@ public String generateDockerFileContent() {
 
   @Override
   public List<String> defaultEntryPoint() {
-    return List.of("node", "dist/%s.js".formatted(context.getFileConfig().name), "-i", "1");
+    if (context instanceof SubContext) {
+      return List.of("node", "dist/%s.js".formatted(context.getFileConfig().name), "-i", "1");
+    } else {
+      return List.of("node", "dist/%s.js".formatted(context.getFileConfig().name));
+    }
   }
 
   @Override