Merge pull request #9 from jfdenise/main

Fix for WFWIP-497
jbossas · Aug 1, 2022 · 091745b · 091745b
2 parents 815ca09 + 1db9b7d
commit 091745b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/...c/main/resources/packages/wildfly.s2i.common/content/bin/launch/backward-compatibility.sh b/...c/main/resources/packages/wildfly.s2i.common/content/bin/launch/backward-compatibility.sh
@@ -0,0 +1,28 @@
+
+function prepareEnv() {
+  unset EAP_ADMIN_USERNAME
+  unset EAP_ADMIN_PASSWORD
+  unset EAP_NODE_NAME
+  unset EAP_HTTPS_NAME
+  unset EAP_HTTPS_PASSWORD
+  unset EAP_HTTPS_KEYSTORE_DIR
+  unset EAP_HTTPS_KEYSTORE
+}
+
+function preConfigure() {
+  convertEnv
+}
+
+function preConfigureEnv() {
+  convertEnv
+}
+
+function convertEnv() {
+  ADMIN_USERNAME=${ADMIN_USERNAME:-${EAP_ADMIN_USERNAME:-$DEFAULT_ADMIN_USERNAME}}
+  ADMIN_PASSWORD=${ADMIN_PASSWORD:-$EAP_ADMIN_PASSWORD}
+  NODE_NAME=${NODE_NAME:-$EAP_NODE_NAME}
+  HTTPS_NAME=${HTTPS_NAME:-$EAP_HTTPS_NAME}
+  HTTPS_PASSWORD=${HTTPS_PASSWORD:-$EAP_HTTPS_PASSWORD}
+  HTTPS_KEYSTORE_DIR=${HTTPS_KEYSTORE_DIR:-$EAP_HTTPS_KEYSTORE_DIR}
+  HTTPS_KEYSTORE=${HTTPS_KEYSTORE:-$EAP_HTTPS_KEYSTORE}
+}
diff --git a/...n-pack/src/main/resources/packages/wildfly.s2i.common/content/bin/launch/launch-config.sh b/...n-pack/src/main/resources/packages/wildfly.s2i.common/content/bin/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=(
   # Must be the first one.
+  $JBOSS_HOME/bin/launch/backward-compatibility.sh
   $JBOSS_HOME/bin/launch/configure_extensions.sh
   $JBOSS_HOME/bin/launch/admin.sh
   $JBOSS_HOME/bin/launch/access_log_valve.sh