amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-07-13 03:55:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94 from jaychris/elasticsearch-fix-start

Browse Source 
fixed env inheritance issue, re-ordered OPTS
This commit is contained in:
Geoff Bourne
2016-07-10 09:50:52 -05:00
committed by GitHub
parent 55e38181bd 87b2ce1c24
commit b9dcdee34b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
elasticsearch/start
+4 -3
View File
@@ -16,8 +16,7 @@ OPTS="$OPTS -Des.path.conf=/conf \
-Des.path.data=/data \ -Des.path.data=/data \
-Des.path.logs=/data \ -Des.path.logs=/data \
-Des.transport.tcp.port=9300 \ -Des.transport.tcp.port=9300 \
-Des.http.port=9200 \ -Des.http.port=9200"
--path.plugins=/conf/plugins"
if [ -n "$CLUSTER" ]; then if [ -n "$CLUSTER" ]; then
OPTS="$OPTS -Des.cluster.name=$CLUSTER" OPTS="$OPTS -Des.cluster.name=$CLUSTER"
@@ -46,6 +45,8 @@ if [ -n "$PUBLISH_AS" ]; then
OPTS="$OPTS -Des.transport.publish_port=$(echo $PUBLISH_AS | awk -F: '{if ($2) print $2; else print 9300}')" OPTS="$OPTS -Des.transport.publish_port=$(echo $PUBLISH_AS | awk -F: '{if ($2) print $2; else print 9300}')"
fi fi
OPTS="$OPTS --path.plugins=/conf/plugins"
if [ -n "$PLUGINS" ]; then if [ -n "$PLUGINS" ]; then
for p in $(echo $PLUGINS | awk -v RS=, '{print}') for p in $(echo $PLUGINS | awk -v RS=, '{print}')
do do
@@ -64,7 +65,7 @@ if [ `id -u` = 0 ]; then
echo "Running as non-root..." echo "Running as non-root..."
chown -R $DEFAULT_ES_USER /data chown -R $DEFAULT_ES_USER /data
set -x set -x
su -c "$CMD" - $DEFAULT_ES_USER su -c "$CMD" $DEFAULT_ES_USER
else else
$CMD $CMD
fi fi