From 476b3ff92eec52c3d2716d063d8e2e2cdd4ee03d Mon Sep 17 00:00:00 2001
From: JF Denise <jdenise@redhat.com>
Date: Tue, 10 Jan 2023 14:14:39 +0100
Subject: [PATCH] Support dual stack network, IP v4 and v6

---
 .../src/main/resources/feature_groups/os-socket.xml           | 2 +-
 jboss/container/eap/launch/common/added/openshift-launch.sh   | 4 ++--
 jboss/container/eap/launch/common/added/openshift-migrate.sh  | 2 +-
 .../eap/launch/ee-no-sso/added/launch/launch-config.sh        | 1 +
 jboss/container/eap/launch/ee/added/launch/launch-config.sh   | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/feature_groups/os-socket.xml b/jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/feature_groups/os-socket.xml
index a2f3e446..34bbc1e9 100644
--- a/jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/feature_groups/os-socket.xml
+++ b/jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/feature_groups/os-socket.xml
@@ -6,6 +6,6 @@
     </feature>
     <feature spec="interface">
         <param name="interface" value="bindall"/>
-        <param name="inet-address" value="0.0.0.0"/>
+        <param name="inet-address" value="${jboss.bind.address.bindall:0.0.0.0}"/>
     </feature>
 </feature-group-spec>
diff --git a/jboss/container/eap/launch/common/added/openshift-launch.sh b/jboss/container/eap/launch/common/added/openshift-launch.sh
index a281986a..9602ef37 100755
--- a/jboss/container/eap/launch/common/added/openshift-launch.sh
+++ b/jboss/container/eap/launch/common/added/openshift-launch.sh
@@ -24,7 +24,7 @@ fi
 
 function runServer() {
   local instanceDir=$1
-  launchServer "$JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement 0.0.0.0 -Djboss.server.data.dir=${instanceDir} -Dwildfly.statistics-enabled=true"
+  launchServer "$JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -Djboss.server.data.dir=${instanceDir} -Dwildfly.statistics-enabled=true"
 }
 
 function init_data_dir() {
@@ -56,4 +56,4 @@ else
 
   runServer "${JBOSS_HOME}/standalone/data"
 
-fi
\ No newline at end of file
+fi
diff --git a/jboss/container/eap/launch/common/added/openshift-migrate.sh b/jboss/container/eap/launch/common/added/openshift-migrate.sh
index f615345d..9551f49d 100644
--- a/jboss/container/eap/launch/common/added/openshift-migrate.sh
+++ b/jboss/container/eap/launch/common/added/openshift-migrate.sh
@@ -5,7 +5,7 @@ RECOVERY_TIMEOUT=${RECOVERY_TIMEOUT:-360}
 RECOVERY_PAUSE=${RECOVERY_PAUSE:-10}
 
 function runMigrationServer() {
-  exec $JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement 127.0.0.1 -Djboss.server.data.dir="$1" ${2} ${JAVA_PROXY_OPTIONS} ${JBOSS_HA_ARGS} ${JBOSS_MESSAGING_ARGS}
+  exec $JBOSS_HOME/bin/standalone.sh -c standalone-openshift.xml -bmanagement ${SERVER_LOOPBACK_ADDRESS} -Djboss.server.data.dir="$1" ${2} ${JAVA_PROXY_OPTIONS} ${JBOSS_HA_ARGS} ${JBOSS_MESSAGING_ARGS}
 }
 
 source ${JBOSS_HOME}/bin/launch/openshift-migrate-common.sh
diff --git a/jboss/container/eap/launch/ee-no-sso/added/launch/launch-config.sh b/jboss/container/eap/launch/ee-no-sso/added/launch/launch-config.sh
index 7c698b2f..6a35cdce 100644
--- a/jboss/container/eap/launch/ee-no-sso/added/launch/launch-config.sh
+++ b/jboss/container/eap/launch/ee-no-sso/added/launch/launch-config.sh
@@ -6,6 +6,7 @@
 # wildfly-cekit-modules will look for each of the listed files and run them if they exist.
 CONFIG_SCRIPT_CANDIDATES=(
   $JBOSS_HOME/bin/launch/backward-compatibility.sh
+  $JBOSS_HOME/bin/launch/ip.sh
   $JBOSS_HOME/bin/launch/configure_extensions.sh
   $JBOSS_HOME/bin/launch/passwd.sh
   $JBOSS_HOME/bin/launch/messaging.sh
diff --git a/jboss/container/eap/launch/ee/added/launch/launch-config.sh b/jboss/container/eap/launch/ee/added/launch/launch-config.sh
index 2553890a..ec48f430 100644
--- a/jboss/container/eap/launch/ee/added/launch/launch-config.sh
+++ b/jboss/container/eap/launch/ee/added/launch/launch-config.sh
@@ -6,6 +6,7 @@
 # wildfly-cekit-modules will look for each of the listed files and run them if they exist.
 CONFIG_SCRIPT_CANDIDATES=(
   $JBOSS_HOME/bin/launch/backward-compatibility.sh
+  $JBOSS_HOME/bin/launch/ip.sh
   $JBOSS_HOME/bin/launch/configure_extensions.sh
   $JBOSS_HOME/bin/launch/passwd.sh
   $JBOSS_HOME/bin/launch/messaging.sh