From 20768878a3de21eb5608347c0600f00d71b3d79b Mon Sep 17 00:00:00 2001 From: manusa Date: Fri, 22 May 2020 15:59:14 +0200 Subject: [PATCH] fix: added required configurations for WildFlySwarmGenerator to work Signed-off-by: Marc Nuri --- CHANGELOG.md | 6 ++++-- .../generator/wildflyswarm/WildFlySwarmGenerator.java | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37876ed564..2c2cbe5492 100644 --- 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 `` is considered instead of `` +* 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/jkube-kit/generator/wildfly-swarm/src/main/java/org/eclipse/jkube/generator/wildflyswarm/WildFlySwarmGenerator.java b/jkube-kit/generator/wildfly-swarm/src/main/java/org/eclipse/jkube/generator/wildflyswarm/WildFlySwarmGenerator.java index fe34f44c26..2d534b4e6b 100644 --- a/jkube-kit/generator/wildfly-swarm/src/main/java/org/eclipse/jkube/generator/wildflyswarm/WildFlySwarmGenerator.java +++ b/jkube-kit/generator/wildfly-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 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 getExtraJavaOptions() { + return Collections.singletonList("-Djava.net.preferIPv4Stack=true"); + } } \ No newline at end of file