clean up logic to always set module arg

GoogleContainerTools · Mar 26, 2024 · b893521 · b893521
1 parent d170729
commit b893521
Showing 1 changed file with 3 additions and 13 deletions.
diff --git a/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/war/WarFiles.java b/jib-cli/src/main/java/com/google/cloud/tools/jib/cli/war/WarFiles.java
@@ -51,7 +51,7 @@ public static JibContainerBuilder toJibContainerBuilder(
       CommonContainerConfigCliOptions commonContainerConfigCliOptions,
       ConsoleLogger logger)
       throws IOException, InvalidImageReferenceException {
-    String baseImage = fetchBaseImage(commonContainerConfigCliOptions);
+    String baseImage = commonContainerConfigCliOptions.getFrom().orElse("jetty");
     JibContainerBuilder containerBuilder =
         ContainerBuilders.create(baseImage, Collections.emptySet(), commonCliOptions, logger);
     List<String> programArguments = commonContainerConfigCliOptions.getProgramArguments();
@@ -77,24 +77,14 @@ private static List<String> computeEntrypoint(
       CommonContainerConfigCliOptions commonContainerConfigCliOptions)
       throws InvalidImageReferenceException {
     List<String> entrypoint = commonContainerConfigCliOptions.getEntrypoint();
-    String baseImage = fetchBaseImage(commonContainerConfigCliOptions);
     if (!entrypoint.isEmpty()) {
       return entrypoint;
     }
     if (commonContainerConfigCliOptions.isJettyBaseimage()) {
-      // If using jetty 12 or later, then specify deploy module. See
+      // Starting with jetty 12, the deploy module needs to be specified. See
       // https://eclipse.dev/jetty/documentation/jetty-12/operations-guide/index.html
-      if (baseImage.equals("jetty")) {
-        return ImmutableList.of(
-            "java", "-jar", "/usr/local/jetty/start.jar", "--module=ee10-deploy");
-      }
-      return ImmutableList.of("java", "-jar", "/usr/local/jetty/start.jar");
+      return ImmutableList.of("java", "-jar", "/usr/local/jetty/start.jar", "--module=ee10-deploy");
     }
     return null;
   }
-
-  private static String fetchBaseImage(
-      CommonContainerConfigCliOptions commonContainerConfigCliOptions) {
-    return commonContainerConfigCliOptions.getFrom().orElse("jetty");
-  }
 }