[es] Upgrade to 5.5.1

Add support for a zip file of mod configs to be supplied!

elasticsearch/Dockerfile

@@ -4,7 +4,7 @@ LABEL maintainer "itzg"
 
 RUN apk -U add bash
 
-ARG ES_VERSION=5.5.0
+ARG ES_VERSION=5.5.1
 # avoid conflicts with debian host systems when mounting to host volume
 ARG DEFAULT_ES_USER_UID=1100
 

elasticsearch/docker-compose-localbuild.yml

@@ -28,7 +28,7 @@ services:
       TYPE: INGEST
       UNICAST_HOSTS: master
   kibana:
-    image: kibana
+    image: kibana:5.5.1
     ports:
       - "5601:5601"
     environment:

minecraft-server/start-minecraft.sh

@@ -425,6 +425,28 @@ case "X$MODPACK" in
 esac
 fi
 
+# If supplied with a URL for a config (simple zip of configurations), download it and unpack
+if [[ "$MODCONFIG" ]]; then
+case "X$MODCONFIG" in
+  X[Hh][Tt][Tt][Pp]*[Zz][iI][pP])
+    echo "Downloading mod/plugin configs via HTTP"
+    echo "  from $MODCONFIG ..."
+    curl -sSL -o /tmp/modconfig.zip "$MODCONFIG"
+    if [ "$TYPE" = "SPIGOT" ]; then
+      mkdir -p /data/plugins
+      unzip -o -d /data/plugins /tmp/modconfig.zip
+    else
+      mkdir -p /data/config
+      unzip -o -d /data/config /tmp/modconfig.zip
+    fi
+    rm -f /tmp/modconfig.zip
+    ;;
+  *)
+    echo "Invalid URL given for modconfig: Must be HTTP or HTTPS and a ZIP file"
+    ;;
+esac
+fi
+
 function setServerProp {
   local prop=$1
   local var=$2