Mirror/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2024-06-07 19:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Forge recommended (not latest) version

Browse Source 
* Misc Dockerfile cleanup
** use COPY instead of ADD
** wget is now pre-installed by base image
This commit is contained in:
Geoff Bourne 2015-03-20 20:26:43 -05:00
parent 8c3b0a720d
commit b1f9d1c7c6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
minecraft-server/Dockerfile
View File

@ -3,7 +3,7 @@ FROM itzg/ubuntu-openjdk-7
MAINTAINER itzg MAINTAINER itzg
RUN apt-get update RUN apt-get update
RUN apt-get install -y wget libmozjs-24-bin imagemagick && apt-get clean RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libmozjs-24-bin imagemagick && apt-get clean
RUN update-alternatives --install /usr/bin/js js /usr/bin/js24 100 RUN update-alternatives --install /usr/bin/js js /usr/bin/js24 100
RUN wget -O /usr/bin/jsawk https://github.com/micha/jsawk/raw/master/jsawk RUN wget -O /usr/bin/jsawk https://github.com/micha/jsawk/raw/master/jsawk
@ -14,11 +14,11 @@ RUN useradd -M -s /bin/false --uid 1000 minecraft \
EXPOSE 25565 EXPOSE 25565
ADD start.sh /start COPY start.sh /start
ADD start-minecraft.sh /start-minecraft COPY start-minecraft.sh /start-minecraft
VOLUME ["/data"] VOLUME ["/data"]
ADD server.properties /tmp/server.properties COPY server.properties /tmp/server.properties
WORKDIR /data WORKDIR /data
CMD [ "/start" ] CMD [ "/start" ]

3
minecraft-server/start-minecraft.sh
View File

@ -45,7 +45,6 @@ case $TYPE in
# norm := the official Minecraft version as Forge is tracking it. dropped the third part starting with 1.8 # norm := the official Minecraft version as Forge is tracking it. dropped the third part starting with 1.8
case $VANILLA_VERSION in case $VANILLA_VERSION in
1.7.*) 1.7.*)
echo OLDER
norm=$VANILLA_VERSION norm=$VANILLA_VERSION
;; ;;
@ -54,7 +53,7 @@ case $TYPE in
;; ;;
esac esac
FORGE_VERSION=`wget -O - http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json | jsawk -n "out(this.promos['$norm-latest'])"` FORGE_VERSION=`wget -O - http://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json | jsawk -n "out(this.promos['$norm-recommended'])"`
normForgeVersion="$norm-$FORGE_VERSION" normForgeVersion="$norm-$FORGE_VERSION"
FORGE_INSTALLER="forge-$normForgeVersion-installer.jar" FORGE_INSTALLER="forge-$normForgeVersion-installer.jar"