Merge pull request #131 from rhuss/master

chore: Update to agent-bond 1.2.0 and Jolokia 1.5.0

java/fish-pepper.yml

@@ -19,4 +19,4 @@ blocks:
   - type: "git"
     url: "https://github.com/fabric8io/agent-bond.git"
     path: "fish-pepper"
-    tag: "v1.1.3"
+    tag: "v1.2.0"

java/images.yml

@@ -15,7 +15,7 @@ config:
       lib:
         version:
           maven: "3.3.3"
-          jolokia: "1.4.0"
+          jolokia: "1.5.0"
           jmxexporter: "0.1.0"
     rhel:
       from: "jboss/openjdk18-rhel7:1.1-7"
@@ -25,5 +25,5 @@ config:
       lib:
         version:
           maven: "3.3.3-1.el7"
-          jolokia: "1.3.6.redhat-1"
+          jolokia: "1.5.0.redhat-1"
           jmxexporter: "0.10"

java/images/jboss/Dockerfile

@@ -1,6 +1,6 @@
 FROM jboss/base-jdk:8
 
-ENV JOLOKIA_VERSION="1.4.0" \
+ENV JOLOKIA_VERSION="1.5.0" \
     PROMETHEUS_JMX_EXPORTER_VERSION="0.1.0" \
     PATH=$PATH:"/usr/local/s2i" \
     AB_JOLOKIA_PASSWORD_RANDOM="true" \
@@ -9,7 +9,7 @@ ENV JOLOKIA_VERSION="1.4.0" \
 
 # Some version information
 LABEL io.fabric8.s2i.version.maven="3.3.3" \
-      io.fabric8.s2i.version.jolokia="1.4.0" \
+      io.fabric8.s2i.version.jolokia="1.5.0" \
       io.fabric8.s2i.version.prometheus.jmx_exporter="0.1.0" \
       io.k8s.description="Platform for building and running plain Java applications (fat-jar and flat classpath)" \
       io.k8s.display-name="Java Applications" \
@@ -54,7 +54,7 @@ EXPOSE 9779
 
 # Jolokia agent
 RUN mkdir -p /opt/jolokia/etc \
- && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.4.0/jolokia-jvm-1.4.0-agent.jar \
+ && curl http://central.maven.org/maven2/org/jolokia/jolokia-jvm/1.5.0/jolokia-jvm-1.5.0-agent.jar \
          -o /opt/jolokia/jolokia.jar
 ADD jolokia-opts /opt/jolokia/jolokia-opts
 RUN chmod 444 /opt/jolokia/jolokia.jar \

java/images/rhel/Dockerfile

@@ -1,6 +1,6 @@
 FROM jboss/openjdk18-rhel7:1.1-7
 
-ENV JOLOKIA_VERSION="1.3.6.redhat-1" \
+ENV JOLOKIA_VERSION="1.5.0.redhat-1" \
     PROMETHEUS_JMX_EXPORTER_VERSION="0.10" \
     PATH=$PATH:"/usr/local/s2i" \
     AB_JOLOKIA_PASSWORD_RANDOM="true" \
@@ -9,7 +9,7 @@ ENV JOLOKIA_VERSION="1.3.6.redhat-1" \
 
 # Some version information
 LABEL io.fabric8.s2i.version.maven="3.3.3-1.el7" \
-      io.fabric8.s2i.version.jolokia="1.3.6.redhat-1" \
+      io.fabric8.s2i.version.jolokia="1.5.0.redhat-1" \
       io.fabric8.s2i.version.prometheus.jmx_exporter="0.10" \
       io.k8s.description="Platform for building and running plain Java applications (fat-jar and flat classpath)" \
       io.k8s.display-name="Java Applications" \
@@ -54,7 +54,7 @@ EXPOSE 9779
 
 # Jolokia agent
 RUN mkdir -p /opt/jolokia/etc \
- && curl https://maven.repository.redhat.com/ga/org/jolokia/jolokia-jvm/1.3.6.redhat-1/jolokia-jvm-1.3.6.redhat-1-agent.jar \
+ && curl https://maven.repository.redhat.com/ga/org/jolokia/jolokia-jvm/1.5.0.redhat-1/jolokia-jvm-1.5.0.redhat-1-agent.jar \
          -o /opt/jolokia/jolokia.jar
 ADD jolokia-opts /opt/jolokia/jolokia-opts
 RUN chmod 444 /opt/jolokia/jolokia.jar \

karaf/fish-pepper.yml

@@ -19,4 +19,4 @@ blocks:
   - type: "git"
     url: "https://github.com/fabric8io/agent-bond.git"
     path: "fish-pepper"
-    tag: "v1.0.2"
+    tag: "v1.2.0"

karaf/images.yml

@@ -30,6 +30,6 @@ config:
       lib:
         version:
           maven: "3.3.3-1.el7"
-          jolokia: "1.3.6.redhat-1"
+          jolokia: "1.5.0.redhat-1"
           karaf: "6.3.0.redhat-187"
           jmxexporter: "0.10"

karaf/images/jboss/jolokia-opts

@@ -3,7 +3,7 @@
 # Check whether a given config is contained in AB_JOLOKIA_OPTS
 is_in_jolokia_opts() {
   local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS}" ] && [ x"${AB_JOLOKIA_OPTS}" != x"${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
      echo "yes"
   else
      echo "no"
@@ -14,42 +14,44 @@ get_jolokia_properties() {
 
   echo "host=${AB_JOLOKIA_HOST:-*}"
   echo "port=${AB_JOLOKIA_PORT:-8778}"
-  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:=false}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
 
-  if [ -n "$AB_JOLOKIA_PASSWORD" ]; then
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
      echo "user=${AB_JOLOKIA_USER:-jolokia}"
      echo "password=${AB_JOLOKIA_PASSWORD}"
   fi
-  if [ -n "$AB_JOLOKIA_HTTPS" ]; then
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
      echo "protocol=https"
-     use_https=1
+     https_used=1
   fi
 
   # Integration with OpenShift client cert auth is enabled
   # by default if not explicitly turned off by setting to 'false'
-  if [ "x${AB_JOLOKIA_AUTH_OPENSHIFT}" != "xfalse" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
      echo "useSslClientAuthentication=true"
      echo "extraClientCheck=true"
 
-     if [ -z ${use_https+x} ]; then
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
        echo "protocol=https"
      fi
      if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
         echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
      fi
 
      if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-        if [  x"${AB_JOLOKIA_AUTH_OPENSHIFT}" != x"${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
            # Supposed to contain a principal name to check
-           echo "clientPrincipal=`echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g'`"
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
         else
            echo "clientPrincipal=cn=system:master-proxy"
         fi
      fi
   fi
 
   # Add extra opts
-  if [ -n "${AB_JOLOKIA_OPTS}" ]; then
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
      echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
   fi
 
@@ -60,12 +62,12 @@ write_jolokia_properties() {
 
   # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
   # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
-  if [ "$AB_JOLOKIA_PASSWORD_RANDOM" == "true" ]; then
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
     pw_file="/opt/jolokia/etc/jolokia.pw"
     if [ -f "${pw_file}" ] ; then
-      AB_JOLOKIA_PASSWORD=`cat "${pw_file}"`
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
     else
-      AB_JOLOKIA_PASSWORD=`tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1`
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
       touch "${pw_file}"
       chmod 660 "${pw_file}"
       cat > "${pw_file}" <<EOF
@@ -83,8 +85,8 @@ EOF
 
 }
 
-if [ -z "${AB_JOLOKIA_OFF+x}" ]; then
-  if [ -z "${AB_JOLOKIA_CONFIG}" ]; then
+if [ -z "${AB_JOLOKIA_OFF:-}" ]; then
+  if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
     AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
     write_jolokia_properties "$AB_JOLOKIA_CONFIG"
   fi

karaf/images/rhel/Dockerfile

@@ -2,7 +2,7 @@ FROM jboss/openjdk18-rhel7:1.1-7
 
 MAINTAINER Dhiraj Bokde <[email protected]>
 
-ENV JOLOKIA_VERSION="1.3.6.redhat-1" \
+ENV JOLOKIA_VERSION="1.5.0.redhat-1" \
     KARAF_FRAMEWORK_VERSION="6.3.0.redhat-187" \
     PROMETHEUS_JMX_EXPORTER_VERSION="0.10" \
     PATH="/usr/local/s2i:$PATH" \
@@ -13,7 +13,7 @@ ENV JOLOKIA_VERSION="1.3.6.redhat-1" \
 EXPOSE 8778
 
 LABEL io.fabric8.s2i.version.maven="3.3.3-1.el7" \
-      io.fabric8.s2i.version.jolokia="1.3.6.redhat-1" \
+      io.fabric8.s2i.version.jolokia="1.5.0.redhat-1" \
       io.fabric8.s2i.version.karaf="6.3.0.redhat-187" \
       io.fabric8.s2i.version.prometheus.jmx_exporter="0.10" \
       io.k8s.description="Platform for building and running Apache Karaf OSGi applications" \
@@ -62,7 +62,7 @@ EXPOSE 9779
 
 # Jolokia agent
 RUN mkdir -p /opt/jolokia/etc \
- && curl https://maven.repository.redhat.com/ga/org/jolokia/jolokia-jvm/1.3.6.redhat-1/jolokia-jvm-1.3.6.redhat-1-agent.jar \
+ && curl https://maven.repository.redhat.com/ga/org/jolokia/jolokia-jvm/1.5.0.redhat-1/jolokia-jvm-1.5.0.redhat-1-agent.jar \
          -o /opt/jolokia/jolokia.jar
 ADD jolokia-opts /opt/jolokia/jolokia-opts
 RUN chmod 444 /opt/jolokia/jolokia.jar \

karaf/images/rhel/jolokia-opts

@@ -3,7 +3,7 @@
 # Check whether a given config is contained in AB_JOLOKIA_OPTS
 is_in_jolokia_opts() {
   local prop=$1
-  if [ -n "${AB_JOLOKIA_OPTS}" ] && [ x"${AB_JOLOKIA_OPTS}" != x"${AB_JOLOKIA_OPTS/${prop}/}" ]; then
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ] && [ "${AB_JOLOKIA_OPTS}" != "${AB_JOLOKIA_OPTS/${prop}/}" ]; then
      echo "yes"
   else
      echo "no"
@@ -14,42 +14,44 @@ get_jolokia_properties() {
 
   echo "host=${AB_JOLOKIA_HOST:-*}"
   echo "port=${AB_JOLOKIA_PORT:-8778}"
-  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:=false}"
+  echo "discoveryEnabled=${AB_JOLOKIA_DISCOVERY_ENABLED:-false}"
 
-  if [ -n "$AB_JOLOKIA_PASSWORD" ]; then
+  if [ -n "${AB_JOLOKIA_PASSWORD:-}" ]; then
      echo "user=${AB_JOLOKIA_USER:-jolokia}"
      echo "password=${AB_JOLOKIA_PASSWORD}"
   fi
-  if [ -n "$AB_JOLOKIA_HTTPS" ]; then
+  if [ -n "${AB_JOLOKIA_HTTPS:-}" ]; then
      echo "protocol=https"
-     use_https=1
+     https_used=1
   fi
 
   # Integration with OpenShift client cert auth is enabled
   # by default if not explicitly turned off by setting to 'false'
-  if [ "x${AB_JOLOKIA_AUTH_OPENSHIFT}" != "xfalse" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
+  if [ "${AB_JOLOKIA_AUTH_OPENSHIFT:-}" != "false" ] && [ -f "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ]; then
      echo "useSslClientAuthentication=true"
      echo "extraClientCheck=true"
 
-     if [ -z ${use_https+x} ]; then
+     # Check if the 'protocol' property has already been set to 'https'
+     # If not, then defaults to using HTTPS
+     if [ -z ${https_used+x} ]; then
        echo "protocol=https"
      fi
      if [ $(is_in_jolokia_opts "caCert") != "yes" ]; then
         echo "caCert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
      fi
 
      if [ $(is_in_jolokia_opts "clientPrincipal") != "yes" ]; then
-        if [  x"${AB_JOLOKIA_AUTH_OPENSHIFT}" != x"${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
+        if [  "${AB_JOLOKIA_AUTH_OPENSHIFT}" != "${AB_JOLOKIA_AUTH_OPENSHIFT/=/}" ]; then
            # Supposed to contain a principal name to check
-           echo "clientPrincipal=`echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g'`"
+           echo "clientPrincipal=$(echo ${AB_JOLOKIA_AUTH_OPENSHIFT} | sed -e 's/ /\\\\ /g')"
         else
            echo "clientPrincipal=cn=system:master-proxy"
         fi
      fi
   fi
 
   # Add extra opts
-  if [ -n "${AB_JOLOKIA_OPTS}" ]; then
+  if [ -n "${AB_JOLOKIA_OPTS:-}" ]; then
      echo "${AB_JOLOKIA_OPTS}" | tr "," "\n"
   fi
 
@@ -60,12 +62,12 @@ write_jolokia_properties() {
 
   # Setup Jolokia to accept basic auth, using a randomly generated password that is stored
   # in the container in the ${DEPLOYMENTS_DIR}/jolokia.pw file.
-  if [ "$AB_JOLOKIA_PASSWORD_RANDOM" == "true" ]; then
+  if [ "${AB_JOLOKIA_PASSWORD_RANDOM:-}" == "true" ]; then
     pw_file="/opt/jolokia/etc/jolokia.pw"
     if [ -f "${pw_file}" ] ; then
-      AB_JOLOKIA_PASSWORD=`cat "${pw_file}"`
+      AB_JOLOKIA_PASSWORD=$(cat "${pw_file}")
     else
-      AB_JOLOKIA_PASSWORD=`tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1`
+      AB_JOLOKIA_PASSWORD=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
       touch "${pw_file}"
       chmod 660 "${pw_file}"
       cat > "${pw_file}" <<EOF
@@ -83,8 +85,8 @@ EOF
 
 }
 
-if [ -z "${AB_JOLOKIA_OFF+x}" ]; then
-  if [ -z "${AB_JOLOKIA_CONFIG}" ]; then
+if [ -z "${AB_JOLOKIA_OFF:-}" ]; then
+  if [ -z "${AB_JOLOKIA_CONFIG:-}" ]; then
     AB_JOLOKIA_CONFIG="/opt/jolokia/etc/jolokia.properties"
     write_jolokia_properties "$AB_JOLOKIA_CONFIG"
   fi