Fixing in the runnable docker build

Author: PicoCreator

docker/javacommons-hazelcast/Dockerfile

@@ -51,6 +51,13 @@ ENV CLUSTER_DISCOVERY "false"
 ENV CLUSTER_DNS_DISCOVERY_SERVICE "localhost"
 ENV CLUSTER_DNS_DISCOVERY_TIMEOUT 10
 
+# Configurable Minimum / Maximum heap size to use
+#
+# Note that if this is not configured, its automatically infered
+# to be about 80% of the container ram limits.
+ENV MIN_HEAP_SIZE=""
+ENV MAX_HEAP_SIZE=""
+
 # Custom entrypoint
 COPY jc-hazelcast-entrypoint.sh /jc-hazelcast-entrypoint.sh
 RUN chmod +x /jc-hazelcast-entrypoint.sh

docker/javacommons-hazelcast/README.md

@@ -23,4 +23,10 @@ ENV CLUSTER_DISCOVERY "false"
 ENV CLUSTER_DNS_DISCOVERY_SERVICE "localhost"
 ENV CLUSTER_DNS_DISCOVERY_TIMEOUT 10
 
+# Configurable Minimum / Maximum heap size to use
+#
+# Note that if this is not configured, its automatically infered
+# to be about 80% of the container ram limits.
+ENV MIN_HEAP_SIZE=""
+ENV MAX_HEAP_SIZE=""
 ```

docker/javacommons-hazelcast/hazelcast.xml

@@ -6,7 +6,7 @@
 <hazelcast xmlns="http://www.hazelcast.com/schema/config"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-           http://www.hazelcast.com/schema/config/hazelcast-config-4.1.xsd">
+           http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
     <!-- 
       Hazelcast cluster name support
     -->
@@ -36,6 +36,6 @@
       </join>
     </network>
 
-    <!-- Management center -->
-    <management-center enabled="${hazelcast.mancenter.enabled}">${hazelcast.mancenter.url}</management-center>
+    <!-- Management center (this config is dropped from 4.0 onwards, in favour on management center side config) -->
+    <!-- <management-center enabled="${hazelcast.mancenter.enabled}">${hazelcast.mancenter.url}</management-center> -->
 </hazelcast>

docker/javacommons-hazelcast/jc-hazelcast-entrypoint.sh

@@ -19,7 +19,7 @@ JAVA_OPTS="-Dhazelcast.initial.min.cluster.size=${CLUSTER_INIT_MIN_SIZE} -Dhazel
 JAVA_OPTS="-Dhazelcast.rest.enabled=true -Dhazelcast.config=/hazelcast.xml ${JAVA_OPTS}"
 
 # Add environment variable support (not needed in 3.12 onward? - need to confirm)
-JAVA_OPTS="-Denv.GROUP_NAME=${GROUP_NAME} ${JAVA_OPTS}"
+JAVA_OPTS="-Denv.CLUSTER_NAME=${CLUSTER_NAME} ${JAVA_OPTS}"
 JAVA_OPTS="-Denv.CLUSTER_INIT_MIN_SIZE=${CLUSTER_INIT_MIN_SIZE} ${JAVA_OPTS}"
 JAVA_OPTS="-Denv.CLUSTER_INIT_WAIT_TIME=${CLUSTER_INIT_WAIT_TIME} ${JAVA_OPTS}"
 JAVA_OPTS="-Denv.CLUSTER_MULTICAST=${CLUSTER_MULTICAST} ${JAVA_OPTS}"
@@ -38,20 +38,22 @@ echo "########################################"
 #
 # This copies over the original bash script, with minor modification
 #
-# from https://github.com/hazelcast/hazelcast-docker/blob/master/hazelcast-oss/start-hazelcast.sh
-# and https://github.com/hazelcast/hazelcast-docker/blob/8918f5114678e0ab37d38e3c6b656503142cf12f/hazelcast-oss/Dockerfile
+# from https://github.com/hazelcast/hazelcast-docker/blob/4.0.1/hazelcast-oss/start-hazelcast.sh
+# and https://github.com/hazelcast/hazelcast-docker/blob/4.0.1/hazelcast-oss/Dockerfile
 #
 # NOTE: At some point this needs to be changed when version bumping, to use the official script instead
 #
 #############################################################################################################################
 
-# PS: This is moved to start of the script
-#-----------------------------------------
+# This is moved to start of the script (above)
+#--------------------------------------------------
 # set -euo pipefail
 #
 # eval JAVA_OPTS=\"${JAVA_OPTS}\"
 # eval CLASSPATH=\"${CLASSPATH}\"
 
+# This is taken from the original
+#--------------------------------------------------
 if [ -n "${CLASSPATH}" ]; then 
   export CLASSPATH="${CLASSPATH_DEFAULT}:${CLASSPATH}"
 else
@@ -64,6 +66,8 @@ else
   export JAVA_OPTS="${JAVA_OPTS_DEFAULT}"
 fi
 
+# This is a custom implementation
+#--------------------------------------------------
 if [ -n "${MIN_HEAP_SIZE}" ]; then
   export JAVA_OPTS="-Xms${MIN_HEAP_SIZE} ${JAVA_OPTS}"
 fi
@@ -72,11 +76,16 @@ if [ -n "${MAX_HEAP_SIZE}" ]; then
   export JAVA_OPTS="-Xmx${MAX_HEAP_SIZE} ${JAVA_OPTS}"
 fi
 
-if [ -n "${MANCENTER_URL}" ]; then
-  export JAVA_OPTS="-Dhazelcast.mancenter.enabled=true -Dhazelcast.mancenter.url=${MANCENTER_URL} ${JAVA_OPTS}"
-else
-  export JAVA_OPTS="-Dhazelcast.mancenter.enabled=false -Dhazelcast.mancenter.url=localhost ${JAVA_OPTS}"
-fi
+# NOTE: Mancenter config from the cluster was dropped in 4.0 onwards
+#       in favour on management center side config
+# if [ -n "${MANCENTER_URL}" ]; then
+#   export JAVA_OPTS="-Dhazelcast.mancenter.enabled=true -Dhazelcast.mancenter.url=${MANCENTER_URL} ${JAVA_OPTS}"
+# else
+#   export JAVA_OPTS="-Dhazelcast.mancenter.enabled=false -Dhazelcast.mancenter.url=localhost ${JAVA_OPTS}"
+# fi
+
+# This is removed from the original
+#--------------------------------------------------
 
 # if [ -n "${PROMETHEUS_PORT}" ]; then
 #   export JAVA_OPTS="-javaagent:${HZ_HOME}/lib/jmx_prometheus_javaagent.jar=${PROMETHEUS_PORT}:${PROMETHEUS_CONFIG} ${JAVA_OPTS}"
@@ -87,12 +96,15 @@ fi
 #   sed -i "s/.level= INFO/.level= ${LOGGING_LEVEL}/g" logging.properties
 # fi
 
+# Starting it up, as per the original script
+#--------------------------------------------------
+
 echo "########################################"
 echo "# JAVA_OPTS=${JAVA_OPTS}"
 echo "# CLASSPATH=${CLASSPATH}"
 echo "# starting now...."
 echo "########################################"
 set -x
-exec java -server ${JAVA_OPTS} com.hazelcast.core.server.StartServer
+exec java -server ${JAVA_OPTS} com.hazelcast.core.server.HazelcastMemberStarter
 
 #############################################################################################################################