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

[mc] Use ENTRYPOINT and pass through extra args

Browse Source 
Enables experimenting for #80
This commit is contained in:
Geoff Bourne
2016-05-28 20:58:36 -05:00
parent dd5a21067b
commit 0defd266a6
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minecraft-server/Dockerfile
+1 -1
View File
@@ -36,7 +36,7 @@ VOLUME ["/plugins"]
COPY server.properties /tmp/server.properties COPY server.properties /tmp/server.properties
WORKDIR /data WORKDIR /data
CMD [ "/start" ] ENTRYPOINT [ "/start" ]
# Special marker ENV used by MCCY management tool # Special marker ENV used by MCCY management tool
ENV MC_IMAGE=YES ENV MC_IMAGE=YES
minecraft-server/get-mcadmin-versions.sh
+2 -2
View File
@@ -6,8 +6,8 @@ if [ $# -lt 1 ]; then
fi fi
cd /tmp cd /tmp
wget -O mcadmin-versions.jar https://bintray.com/itzgeoff/artifacts/download_file?file_path=me%2Fitzg%2Fmcadmin-versions%2F1.1.0%2Fmcadmin-versions-1.1.0.jar wget -qO mcadmin-versions.jar https://bintray.com/itzgeoff/artifacts/download_file?file_path=me%2Fitzg%2Fmcadmin-versions%2F1.1.0%2Fmcadmin-versions-1.1.0.jar
wget http://central.maven.org/maven2/org/jsoup/jsoup/1.9.1/jsoup-1.9.1.jar wget -q http://central.maven.org/maven2/org/jsoup/jsoup/1.9.1/jsoup-1.9.1.jar
java -jar mcadmin-versions.jar $1 > /tmp/mcadmin-versions.db java -jar mcadmin-versions.jar $1 > /tmp/mcadmin-versions.db
rm *.jar rm *.jar
minecraft-server/start-minecraft.sh
+2 -2
View File
@@ -398,9 +398,9 @@ fi
# If we have a bootstrap.txt file... feed that in to the server stdin # If we have a bootstrap.txt file... feed that in to the server stdin
if [ -f /data/bootstrap.txt ]; if [ -f /data/bootstrap.txt ];
then then
exec java $JVM_OPTS -jar $SERVER < /data/bootstrap.txt exec java $JVM_OPTS -jar $SERVER $* < /data/bootstrap.txt
else else
exec java $JVM_OPTS -jar $SERVER exec java $JVM_OPTS -jar $SERVER $*
fi fi
exec java $JVM_OPTS -jar $SERVER exec java $JVM_OPTS -jar $SERVER
minecraft-server/start.sh
+1 -1
View File
@@ -16,4 +16,4 @@ mkdir -p /home/minecraft
chown minecraft: /home/minecraft chown minecraft: /home/minecraft
echo "Switching to user 'minecraft'" echo "Switching to user 'minecraft'"
exec sudo -E -u minecraft /start-minecraft exec sudo -E -u minecraft /start-minecraft $*