salt/docker-minecraft
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: salt:openjdk11
Branches Tags
salt:master salt:openjdk11
salt:1.16.5-36.1.13-1.1.0 salt:1.16.5-36.1.13-1.0.0 salt:1.16.5-36.1.4-1.0.0
..
compare: salt:62c4ef86af99366cf4aa6c65b582436f42897b0e
Branches Tags
salt:master salt:openjdk11
salt:1.16.5-36.1.13-1.1.0 salt:1.16.5-36.1.13-1.0.0 salt:1.16.5-36.1.4-1.0.0

1 Commits
openjdk11 ... 62c4ef86af

Author SHA1 Message Date
Salt
62c4ef86af Add the ability to define a configuration repo that's also live-downloaded 2021-05-29 14:23:41 -05:00
3 changed files with 8 additions and 9 deletions
Expand all files Collapse all files

6
Dockerfile
View File

@@ -3,12 +3,12 @@ FROM alpine:latest AS build
# Args # Args
ARG MINECRAFT_VERSION="1.16.5" ARG MINECRAFT_VERSION="1.16.5"
ARG FORGE_VERSION="36.2.22" ARG FORGE_VERSION="36.1.13"
# The actual setup work # The actual setup work
COPY start-server.sh /minecraft/start-server.sh COPY start-server.sh /minecraft/start-server.sh
WORKDIR /minecraft WORKDIR /minecraft
RUN apk add curl openjdk11-jre &&\ RUN apk add curl openjdk8-jre &&\
curl -L "https://files.minecraftforge.net/maven/net/minecraftforge/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar" -o installer.jar &&\ curl -L "https://files.minecraftforge.net/maven/net/minecraftforge/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar" -o installer.jar &&\
java -jar installer.jar --installServer &&\ java -jar installer.jar --installServer &&\
echo "eula=true" > eula.txt &&\ echo "eula=true" > eula.txt &&\
@@ -16,7 +16,7 @@ RUN apk add curl openjdk11-jre &&\
ln -s "forge-${MINECRAFT_VERSION}-${FORGE_VERSION}.jar" server.jar ln -s "forge-${MINECRAFT_VERSION}-${FORGE_VERSION}.jar" server.jar
# The second stage is the actual container # The second stage is the actual container
FROM openjdk:11 FROM openjdk:8
RUN apt-get update && apt-get install rsync screen -y RUN apt-get update && apt-get install rsync screen -y
WORKDIR /minecraft WORKDIR /minecraft
COPY --from=build /minecraft . COPY --from=build /minecraft .

4
build.sh
View File

@@ -5,12 +5,14 @@
# MC version list # MC version list
declare -a mcversions=( declare -a mcversions=(
"1.12.2"
"1.16.5" "1.16.5"
) )
# Forge version dictionary (we only support one version per) # Forge version dictionary (we only support one version per)
declare -A forgeversions=( declare -A forgeversions=(
["1.16.5"]="36.2.22" ["1.12.2"]="14.23.5.2855"
["1.16.5"]="36.1.13"
) )
# Build images # Build images

7
start-server.sh
View File

@@ -16,7 +16,7 @@ if [ -n "$FORGE_PACK_ZIP" ]; then
unzip pack.zip unzip pack.zip
directory="$(find . -type d -iname "mods" -execdir pwd \; | sort -n | head -n 1)" directory="$(find . -type d -iname "mods" -execdir pwd \; | sort -n | head -n 1)"
echo "Found modpack directory: $directory" echo "Found modpack directory: $directory"
rsync -av --ignore-existing "$directory"/ /minecraft/ rsync -av "$directory"/ /minecraft/
popd > /dev/null 2>&1 popd > /dev/null 2>&1
fi fi
@@ -27,7 +27,7 @@ if [ -n "$CONFIG_REPO" ]; then
pushd "$tmpdir" > /dev/null 2>&1 pushd "$tmpdir" > /dev/null 2>&1
git clone "$CONFIG_REPO" . git clone "$CONFIG_REPO" .
rm -rf .git rm -rf .git
rsync -av --delete ./ /minecraft/ rsync -av ./ /minecraft/
popd > /dev/null 2>&1 popd > /dev/null 2>&1
fi fi
@@ -42,9 +42,6 @@ args="-jar server.jar nogui"
# Debugging info # Debugging info
java -version java -version
echo "Invoking java with args: $args" echo "Invoking java with args: $args"
echo
echo "To see the server console, execute this command in the container:"
echo " screen -r minecraft"
# Start 'er up # Start 'er up
cleanup() { cleanup() {