Merge pull request #173 from opHASnoNAME/master

Set UID for ES_DEFAULT_USER to 1100, avoid conflicts with debian host…

elasticsearch/Dockerfile

@@ -5,6 +5,8 @@ LABEL maintainer "itzg"
 RUN apk -U add bash
 
 ARG ES_VERSION=5.5.0
+# avoid conflicts with debian host systems when mounting to host volume
+ARG DEFAULT_ES_USER_UID=1100
 
 ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp
 # need to adapt to both Docker's new remote-unpack-ADD behavior and the old behavior
@@ -21,9 +23,10 @@ HEALTHCHECK --timeout=5s CMD wget -q -O - http://$HOSTNAME:9200/_cat/health
 
 ENV ES_HOME=/usr/share/elasticsearch-$ES_VERSION \
     DEFAULT_ES_USER=elasticsearch \
+    DEFAULT_ES_USER_UID=$DEFAULT_ES_USER_UID \
     ES_JAVA_OPTS="-Xms1g -Xmx1g"
 
-RUN adduser -S -s /bin/sh $DEFAULT_ES_USER
+RUN adduser -S -s /bin/sh -u $DEFAULT_ES_USER_UID $DEFAULT_ES_USER
 
 VOLUME ["/data","/conf"]
 

minecraft-server/start-minecraft.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+shopt -s nullglob
+
 #umask 002
 export HOME=/data
 
@@ -561,12 +563,12 @@ if [ -n "$ICON" -a ! -e server-icon.png ]; then
 fi
 
 # Make sure files exist and are valid JSON (for pre-1.12 to 1.12 upgrades)
-if [[ ! -e banned-players.json || ! $(jq banned-players.json &> /dev/null) ]]; then
-	echo '[]' > banned-players.json
-fi
-if [[ ! -e banned-ips.json || ! $(jq banned-ips.json &> /dev/null) ]]; then
-	echo '[]' > banned-ips.json
-fi
+for j in *.json; do
+  if [[ $(python -c "print open('$j').read().strip()==''") = True ]]; then
+    echo "Fixing JSON $j"
+    echo '[]' > $j
+  fi
+done
 
 # If any modules have been provided, copy them over
 mkdir -p /data/mods