fix: added required configurations for WildFlySwarmGenerator to work

Signed-off-by: Marc Nuri <[email protected]>
rohanKanojia · May 27, 2020 · 2076887 · 2076887
1 parent 7246051
commit 2076887
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,9 +27,11 @@ Usage:
 * Fix #201: Webapp-Wildfly supports S2I source builds too (3 modes Docker, OpenShift-Docker, OpenShift-S2I)
 * Fix #205: JavaExecGenerator uses jkube/jkube-java-binary-s2i for Docker and S2I builds (#183)
 * Fix #206: WebAppGenerator with "/" path renames artifacts to ROOT.war
-* Fix #206: WebAppGenerator>TomcatAppSeverHandler uses quay.io/jkube/jkube-tomcat9-binary-s2i as base image
-* Fix #210: WebAppGenerator>JettyAppSeverHandler uses quay.io/jkube/jkube-jetty9-binary-s2i as base image
+* Fix #206: WebAppGenerator\>TomcatAppSeverHandler uses quay.io/jkube/jkube-tomcat9-binary-s2i as base image
+* Fix #210: WebAppGenerator\>JettyAppSeverHandler uses quay.io/jkube/jkube-jetty9-binary-s2i as base image
 * Fix #211: pom.xml configured runtime mode `<mode>` is considered instead of `<configuredRuntimeMode>`
+* Fix #209: WildFlySwarmGenerator includes required env variables + java options
+
 
 ### 1.0.0-alpha-3 (2020-05-06)
 * Fix #167: Add CMD for wildfly based applications

diff --git a/...y-swarm/src/main/java/org/eclipse/jkube/generator/wildflyswarm/WildFlySwarmGenerator.java b/...y-swarm/src/main/java/org/eclipse/jkube/generator/wildflyswarm/WildFlySwarmGenerator.java
@@ -13,6 +13,7 @@
  */
 package org.eclipse.jkube.generator.wildflyswarm;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -44,6 +45,12 @@ protected Map<String, String> getEnv(boolean isPrepackagePhase) {
         // - https://github.com/fabric8io/fabric8-maven-plugin/issues/1173
         // - https://issues.jboss.org/browse/SWARM-1859
         ret.put("AB_PROMETHEUS_OFF", "true");
+        ret.put("AB_OFF", "true");
         return ret;
     }
+
+    @Override
+    protected List<String> getExtraJavaOptions() {
+        return Collections.singletonList("-Djava.net.preferIPv4Stack=true");
+    }
 }