improved jolokia

s2i-liberty/Dockerfile

@@ -10,12 +10,16 @@ LABEL io.openshift.s2i.scripts-url=image:///usr/local/s2i \
       io.k8s.description="Platform for building and running JEE applications on IBM WebSphere Liberty Profile" \
       io.k8s.display-name="Liberty 16.0.0_03" \
       io.openshift.expose-services="9080/http:http, 9443/https:https" \
-      io.openshift.tags="runner,liberty" 
+      io.openshift.tags="runner,liberty" \
+      io.openshift.s2i.destination="/tmp"
 
 ENV STI_SCRIPTS_PATH="/usr/local/s2i" \ 
     WORKDIR="/usr/local/workdir" \
     WLP_DEBUG_ADDRESS="7777" \
-    JOLOKIA_PORT="8778"
+    JOLOKIA_PORT="8778" \
+    WLP_ENABLE_DEBUG="false" \ 
+    ENABLE_JOLOKIA="true" \
+    S2I_DESTINATION="/tmp"
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
 COPY ./s2i/bin/ $STI_SCRIPTS_PATH

s2i-liberty/s2i/bin/assemble-runtime

@@ -5,14 +5,14 @@ cp $WORKDIR/artifacts/* /config/dropins/
 echo copy anything in $WORKDIR/config to config
 cp $WORKDIR/config/*  /config
 
-if [ -d "/tmp/src/artifacts" ]; then
-  #echo copy anything in tmp/src/artifacts to dropins
-  cp /tmp/src/artifacts/* /config/dropins/
+if [ -d "$S2I_DESTINATION/src/artifacts" ]; then
+  #echo copy anything in $S2I_DESTINATION/src/artifacts to dropins
+  cp $S2I_DESTINATION/src/artifacts/* /config/dropins/
 fi
 
-if [ -d "/tmp/src/config" ]; then
-  #echo copy anything in tmp/src/artifacts to dropins
-  cp /tmp/src/config/* /config
+if [ -d "$S2I_DESTINATION/src/config" ]; then
+  #echo copy anything in $S2I_DESTINATION/src/artifacts to dropins
+  cp $S2I_DESTINATION/src/config/* /config
 fi
 
 exit $rc

s2i-liberty/s2i/bin/run

@@ -1,6 +1,10 @@
 #!/bin/bash
 
 #comment this line to disable debug
-echo $'\n'JAVA_DEBUG="-Dwas.debug.mode=true -Dcom.ibm.websphere.ras.inject.at.transform=true -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${WLP_DEBUG_ADDRESS}"$'\n' >> /opt/ibm/wlp/usr/servers/defaultServer/server.env
-echo "-javaagent:$WORKDIR/jolokia.jar=port=$JOLOKIA_PORT,protocol=https,caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt,clientPrincipal=cn=system:master-proxy,useSslClientAuthentication=true,extraClientCheck=true,host=0.0.0.0,discoveryEnabled=false"$'\n' >> /opt/ibm/wlp/usr/servers/defaultServer/server.env      
+if ["$ENABLE_DEBUG" -eq "true"]; then
+  echo $'\n'JAVA_DEBUG="-Dwas.debug.mode=true -Dcom.ibm.websphere.ras.inject.at.transform=true -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${WLP_DEBUG_ADDRESS}"$'\n' >> /opt/ibm/wlp/usr/servers/defaultServer/server.env;
+fi
+if ["ENABLE_JOLOKIA" -eq "true"]; then  
+	echo "-javaagent:$WORKDIR/jolokia.jar=port=$JOLOKIA_PORT,protocol=https,caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt,clientPrincipal=cn=system:master-proxy,useSslClientAuthentication=true,extraClientCheck=true,host=0.0.0.0,discoveryEnabled=false"$'\n' >> /opt/ibm/wlp/usr/servers/defaultServer/jvm.options;
+fi	      
 /opt/ibm/wlp/bin/server run defaultServer