mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2024-06-07 19:40:43 +00:00
Use Forge recommended (not latest) version
* Misc Dockerfile cleanup ** use COPY instead of ADD ** wget is now pre-installed by base image
This commit is contained in:
parent
8c3b0a720d
commit
b1f9d1c7c6
@ -3,7 +3,7 @@ FROM itzg/ubuntu-openjdk-7
|
||||
MAINTAINER itzg
|
||||
|
||||
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 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
|
||||
|
||||
ADD start.sh /start
|
||||
ADD start-minecraft.sh /start-minecraft
|
||||
COPY start.sh /start
|
||||
COPY start-minecraft.sh /start-minecraft
|
||||
|
||||
VOLUME ["/data"]
|
||||
ADD server.properties /tmp/server.properties
|
||||
COPY server.properties /tmp/server.properties
|
||||
WORKDIR /data
|
||||
|
||||
CMD [ "/start" ]
|
||||
|
@ -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
|
||||
case $VANILLA_VERSION in
|
||||
1.7.*)
|
||||
echo OLDER
|
||||
norm=$VANILLA_VERSION
|
||||
;;
|
||||
|
||||
@ -54,7 +53,7 @@ case $TYPE in
|
||||
;;
|
||||
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"
|
||||
FORGE_INSTALLER="forge-$normForgeVersion-installer.jar"
|
||||
|
Loading…
Reference in New Issue
Block a user