Skip to content

Commit

Permalink
feat: enforce right version of forge
Browse files Browse the repository at this point in the history
  • Loading branch information
tboerger committed Feb 22, 2024
1 parent 666e4eb commit c6cfea0
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 2 deletions.
10 changes: 9 additions & 1 deletion docker/Dockerfile.amd64
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
FROM ghcr.io/dockhippie/minecraft-forge:47.2-amd64
FROM ghcr.io/dockhippie/minecraft-vanilla:1.20.1-arm64 AS build

EXPOSE 25565 25575 8123

ENV FORGE_VERSION 47.1.84
ENV FORGE_URL https://maven.minecraftforge.net/net/minecraftforge/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar

ENV DYNMAP_JAR Dynmap-3.7-beta-4-forge-1.20.jar
ENV DYNMAP_URL https://mediafilez.forgecdn.net/files/4979/24/${DYNMAP_JAR}

RUN apt-get update && \
apt-get upgrade -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
curl --create-dirs -sLo /usr/share/minecraft/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar ${FORGE_URL} && \
cd /usr/share/minecraft && \
mkdir mods && \
java -jar forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar --installServer && \
rm -f forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar.log run.bat run.sh && \
curl --create-dirs -sLo /usr/share/minecraft/mods/${DYNMAP_JAR} ${DYNMAP_URL}

ENV MINECRAFT_LEVEL_TYPE DEFAULT
Expand Down
10 changes: 9 additions & 1 deletion docker/Dockerfile.arm64
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
FROM ghcr.io/dockhippie/minecraft-forge:47.2-arm64
FROM ghcr.io/dockhippie/minecraft-vanilla:1.20.1-amd64 AS build

EXPOSE 25565 25575 8123

ENV FORGE_VERSION 47.1.84
ENV FORGE_URL https://maven.minecraftforge.net/net/minecraftforge/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar

ENV DYNMAP_JAR Dynmap-3.7-beta-4-forge-1.20.jar
ENV DYNMAP_URL https://mediafilez.forgecdn.net/files/4979/24/${DYNMAP_JAR}

RUN apt-get update && \
apt-get upgrade -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
curl --create-dirs -sLo /usr/share/minecraft/forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar ${FORGE_URL} && \
cd /usr/share/minecraft && \
mkdir mods && \
java -jar forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar --installServer && \
rm -f forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar forge-${MINECRAFT_VERSION}-${FORGE_VERSION}-installer.jar.log run.bat run.sh && \
curl --create-dirs -sLo /usr/share/minecraft/mods/${DYNMAP_JAR} ${DYNMAP_URL}

ENV MINECRAFT_LEVEL_TYPE DEFAULT
Expand Down
6 changes: 6 additions & 0 deletions overlay/etc/container.d/25-mods.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

if [ ! -d ${MINECRAFT_MODS_DIR} ]; then
echo "> creating mods dir"
mkdir -p ${MINECRAFT_MODS_DIR}
fi
File renamed without changes.
6 changes: 6 additions & 0 deletions overlay/etc/entrypoint.d/20-forge.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

declare -x MINECRAFT_MODS_DIR
[[ -z "${MINECRAFT_MODS_DIR}" ]] && MINECRAFT_MODS_DIR="${MINECRAFT_GAME_DIR}/mods"

true
File renamed without changes.
22 changes: 22 additions & 0 deletions overlay/usr/bin/container
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env bash
set -eo pipefail
source /usr/bin/entrypoint

for FILE in $(find /etc/container.d -type f -iname \*.sh | sort); do
source ${FILE}
done

pushd ${MINECRAFT_GAME_DIR} >/dev/null
STARTCMD="su-exec minecraft java"

if [ -n "${MINECRAFT_MAXHEAP}" ]; then
STARTCMD="${STARTCMD} -Xmx${MINECRAFT_MAXHEAP}"
fi

if [ -n "${MINECRAFT_MINHEAP}" ]; then
STARTCMD="${STARTCMD} -Xms${MINECRAFT_MINHEAP}"
fi

echo "> starting minecraft server"
exec ${STARTCMD} ${JAVA_OPTS} @libraries/net/minecraftforge/forge/${MINECRAFT_VERSION}-${FORGE_VERSION}/unix_args.txt ${MINECRAFT_OPTS}
popd >/dev/null

0 comments on commit c6cfea0

Please sign in to comment.