From b93f346b33514d24a512c4eb3e4ad6cb1e8b4c88 Mon Sep 17 00:00:00 2001
From: James Netherton <jnethert@redhat.com>
Date: Wed, 10 Dec 2014 11:52:17 +0000
Subject: [PATCH] [resolves #152], [resolves #153] Simplify startup script and
 unset username / password env vars

---
 docker/etc/context/Dockerfile |  7 ++--
 docker/etc/context/startup.sh | 63 +++++++++++++----------------------
 2 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/docker/etc/context/Dockerfile b/docker/etc/context/Dockerfile
index 305583b1e7..95d1de08b2 100644
--- a/docker/etc/context/Dockerfile
+++ b/docker/etc/context/Dockerfile
@@ -15,11 +15,8 @@ RUN chown -R jboss.jboss /opt/jboss/wildfly
 RUN chmod +x /opt/jboss/wildfly/extras/startup.sh
 USER jboss
 
-# Default to operating in standalone mode
-ENV WILDFLY_OPERATING_MODE standalone
-
 # Expose the native management port 
 EXPOSE 9999
 
-# Set the default command to run on startup
-CMD ["/opt/jboss/wildfly/extras/startup.sh"]
\ No newline at end of file
+# Set default command line args for standalone mode
+CMD ["/opt/jboss/wildfly/extras/startup.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0", "-c", "standalone-camel.xml"]
diff --git a/docker/etc/context/startup.sh b/docker/etc/context/startup.sh
index 0b41be5a81..cf4185151a 100755
--- a/docker/etc/context/startup.sh
+++ b/docker/etc/context/startup.sh
@@ -1,46 +1,29 @@
 #!/bin/sh
 
-if [[ ${WILDFLY_OPERATING_MODE} == "domain" ]] || [[ ${WILDFLY_OPERATING_MODE} == "standalone" ]]
-then
-  readonly BASE_DIR=${WILDFLY_BASE_DIR:-${JBOSS_HOME}/${WILDFLY_OPERATING_MODE}}
-  readonly OPERATING_MODE=$(echo ${WILDFLY_OPERATING_MODE} | tr '[:lower:]' '[:upper:]')
-  readonly PROPERTY_PREFIX=$([ "$WILDFLY_OPERATING_MODE" == "standalone" ] && echo "server" || echo "domain")
-  readonly WILDFLY_EXTRAS=${JBOSS_HOME}/extras
-  readonly WILDFLY_PROPERTIES=${WILDFLY_EXTRAS}/wildfly.properties
-
-  # Setup app server properties from env vars (if present) or use defaults
-  cat << EOF > ${WILDFLY_PROPERTIES}
-jboss.${PROPERTY_PREFIX}.base.dir=${BASE_DIR:-${JBOSS_HOME}/${WILDFLY_OPERATING_MODE}}
-jboss.${PROPERTY_PREFIX}.config.dir=${WILDFLY_CONFIG_DIR:-${BASE_DIR}/configuration}
-jboss.${PROPERTY_PREFIX}.data.dir=${WILDFLY_DATA_DIR:-${BASE_DIR}/data}
-jboss.${PROPERTY_PREFIX}.log.dir=${WILDFLY_LOG_DIR:-${BASE_DIR}/log}
-jboss.${PROPERTY_PREFIX}.temp.dir=${WILDFLY_TEMP_DIR:-${BASE_DIR}/tmp}
-jboss.${PROPERTY_PREFIX}.deploy.dir=${WILDFLY_DEPLOYMENT_DIR:-${BASE_DIR}/content}
-EOF
+# Work out our operating mode
+WILDFLY_OPERATING_MODE=standalone
 
-  # Add servers.dir property if running domain mode
-  if [[ ${WILDFLY_OPERATING_MODE} == "domain" ]]
-  then
-    echo "jboss.${WILDFLY_OPERATING_MODE}.servers.dir=${WILDFLY_DOMAIN_SERVERS_DIR:-${BASE_DIR}/servers}" >> ${WILDFLY_PROPERTIES}
-  fi
+for ARG in "$@"
+do
+    # Assume domain mode if domain config args have been given
+    if [[ "${ARG}" =~ jboss\.domain|domain-config|host-config ]]
+    then
+        WILDFLY_OPERATING_MODE=domain
+    fi
+done
 
-  # Create default app server users
-  if [[ ! -z "${WILDFLY_ADMIN_USER}" ]] && [[ ! -z "${WILDFLY_ADMIN_PASSWORD}" ]]
-  then
-      ${JBOSS_HOME}/bin/add-user.sh --silent -e -u ${WILDFLY_ADMIN_USER} -p ${WILDFLY_ADMIN_PASSWORD}
-  fi
-
-  if [[ ! -z "${HAWTIO_USER}" ]] && [[ ! -z "${HAWTIO_PASSWORD}" ]]
-  then
-      ${JBOSS_HOME}/bin/add-user.sh --silent -e -a -u ${HAWTIO_USER} -p ${HAWTIO_PASSWORD}
-  fi
+# Create default app server users
+if [[ ! -z "${WILDFLY_ADMIN_USER}" ]] && [[ ! -z "${WILDFLY_ADMIN_PASSWORD}" ]]
+then
+  ${JBOSS_HOME}/bin/add-user.sh --silent -e -u ${WILDFLY_ADMIN_USER} -p ${WILDFLY_ADMIN_PASSWORD}
+  unset ${WILDFLY_ADMIN_USER} ${WILDFLY_ADMIN_PASSWORD}
+fi
 
-  # Run startup script for chosen operating mode
- exec ${JBOSS_HOME}/bin/${WILDFLY_OPERATING_MODE}.sh -c ${WILDFLY_CONFIG_FILE:-${WILDFLY_OPERATING_MODE}-camel.xml} \
-                                                     -b ${WILDFLY_BIND_ADDRESS:-"0.0.0.0"} \
-                                                     -bmanagement ${WILDFLY_MANAGEMENT_BIND_ADDRESS:-"0.0.0.0"} \
-                                                     -P=${WILDFLY_EXTRAS}/wildfly.properties
-else
-  echo "Unknown operating environment '${WILDFLY_OPERATING_MODE}'. Valid options are 'standalone' or 'domain'"
-  exit 1
+if [[ ! -z "${HAWTIO_USER}" ]] && [[ ! -z "${HAWTIO_PASSWORD}" ]]
+then
+  ${JBOSS_HOME}/bin/add-user.sh --silent -e -a -u ${HAWTIO_USER} -p ${HAWTIO_PASSWORD}
+  unset ${HAWTIO_USER} ${HAWTIO_PASSWORD}
 fi
+
+# Run startup script for chosen operating mode
+exec ${JBOSS_HOME}/bin/${WILDFLY_OPERATING_MODE}.sh "$@"