From 2072d010cbedcaa7dc076b6a71c2f27ae3da3f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20T=C3=B6nsing?= Date: Thu, 24 Jun 2021 09:03:12 +0200 Subject: [PATCH 01/31] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12a4739..ee89f2c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Docker Minecraft PaperMC Server 1.17 -Docker Minecraft PaperMC server 1,17, 1.16.x, 1.15.2, 1.14.4 (legacy) or 1.13.2 (legacy) +Docker Minecraft PaperMC server 1.17, 1.16.x, 1.15.2, 1.14.4 (legacy) or 1.13.2 (legacy) ## Quick Start ```sh From a775c5d3ec0be6acd8379286b784ebc3e144da19 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Tue, 30 Nov 2021 22:00:31 +0100 Subject: [PATCH 02/31] 1.18 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1743c5e..22beaa4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apk --no-cache add curl LABEL Marc Tönsing -ARG version=1.17.1 +ARG version=1.18 ######################################################## From c7c1417d21efefdc5a7fda9d770f0bf5bdd596a8 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 10:15:36 +0100 Subject: [PATCH 03/31] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 22beaa4..40cbda5 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ######################################################## ############## We use a java base image ################ ######################################################## -FROM openjdk:16-alpine AS build +FROM openjdk:17-alpine AS build RUN apk --no-cache add curl LABEL Marc Tönsing @@ -18,7 +18,7 @@ RUN chmod +x /getpaperserver.sh RUN /getpaperserver.sh ${version} # Run paperclip and obtain patched jar -RUN /opt/openjdk-16/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 +RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 # Copy built jar RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar @@ -26,7 +26,7 @@ RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar ######################################################## ############## Running environment ##################### ######################################################## -FROM openjdk:16-alpine AS runtime +FROM openjdk:17-alpine AS runtime # Working directory WORKDIR /data From 7714971735689cf2ee59fe49e2cf5efeb06bc96a Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 10:24:30 +0100 Subject: [PATCH 04/31] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 40cbda5..9dc9482 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ######################################################## ############## We use a java base image ################ ######################################################## -FROM openjdk:17-alpine AS build +FROM openjdk:18-alpine AS build RUN apk --no-cache add curl LABEL Marc Tönsing @@ -18,7 +18,7 @@ RUN chmod +x /getpaperserver.sh RUN /getpaperserver.sh ${version} # Run paperclip and obtain patched jar -RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 +RUN /opt/openjdk-18/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 # Copy built jar RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar @@ -26,7 +26,7 @@ RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar ######################################################## ############## Running environment ##################### ######################################################## -FROM openjdk:17-alpine AS runtime +FROM openjdk:18-alpine AS runtime # Working directory WORKDIR /data From 2ad9ada3a2c68e9cb349b2d07fc828a40ad0bbac Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 10:37:25 +0100 Subject: [PATCH 05/31] java 17 --- Dockerfile | 6 +++--- docker-entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9dc9482..057043a 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ######################################################## ############## We use a java base image ################ ######################################################## -FROM openjdk:18-alpine AS build +FROM eclipse-temurin:17-alpine AS build RUN apk --no-cache add curl LABEL Marc Tönsing @@ -18,7 +18,7 @@ RUN chmod +x /getpaperserver.sh RUN /getpaperserver.sh ${version} # Run paperclip and obtain patched jar -RUN /opt/openjdk-18/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 +RUN java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 # Copy built jar RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar @@ -26,7 +26,7 @@ RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar ######################################################## ############## Running environment ##################### ######################################################## -FROM openjdk:18-alpine AS runtime +FROM eclipse-temurin:17-alpine AS runtime # Working directory WORKDIR /data diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index db55dda..7d51836 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -20,4 +20,4 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then fi export HOME=/home/$DOCKER_USER -exec su-exec $DOCKER_USER /opt/openjdk-16/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui +exec su-exec $DOCKER_USER java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui From f44f9d415ae2f2aaf90c88c880c0d8515c066fba Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 10:50:19 +0100 Subject: [PATCH 06/31] Update Dockerfile --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 057043a..74ed025 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ######################################################## ############## We use a java base image ################ ######################################################## -FROM eclipse-temurin:17-alpine AS build +FROM openjdk:17-alpine AS build RUN apk --no-cache add curl LABEL Marc Tönsing @@ -20,13 +20,14 @@ RUN /getpaperserver.sh ${version} # Run paperclip and obtain patched jar RUN java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 + # Copy built jar -RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar +RUN mv /opt/minecraft/cache/*.jar paperspigot.jar ######################################################## ############## Running environment ##################### ######################################################## -FROM eclipse-temurin:17-alpine AS runtime +FROM openjdk:17-alpine AS runtime # Working directory WORKDIR /data From a8e463b777c264974f5b7021c7906d54518824eb Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 13:02:42 +0100 Subject: [PATCH 07/31] Update docker-entrypoint.sh --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 7d51836..2bde15f 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -20,4 +20,4 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then fi export HOME=/home/$DOCKER_USER -exec su-exec $DOCKER_USER java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui +exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui From 89a8933a78aea649ac2e2a358722e5c2f2f080f9 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 13:08:49 +0100 Subject: [PATCH 08/31] Update docker-entrypoint.sh --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 2bde15f..21b68a6 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -20,4 +20,4 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then fi export HOME=/home/$DOCKER_USER -exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui +exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nogui From 64b893decf75196578b19b98b1d1ecbfc2d19b86 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 13:09:11 +0100 Subject: [PATCH 09/31] Update docker-entrypoint.sh --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 21b68a6..687cdc9 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -20,4 +20,4 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then fi export HOME=/home/$DOCKER_USER -exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nogui +exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar nogui From e7165ad685c8a36bc40686e8e6fe8392f4da1368 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 13:17:57 +0100 Subject: [PATCH 10/31] eula --- Dockerfile | 2 +- docker-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74ed025..a99e3b1 100755 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,7 @@ ARG memory_size=3G ENV MEMORYSIZE=$memory_size # Set Java Flags -ARG java_flags="-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=mcflags.emc.gs -Dcom.mojang.eula.agree=true" +ARG java_flags="-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=mcflags.emc.gs" ENV JAVAFLAGS=$java_flags WORKDIR /data diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 687cdc9..194d5c5 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -20,4 +20,4 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then fi export HOME=/home/$DOCKER_USER -exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar nogui +exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -Dcom.mojang.eula.agree=true -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar nogui From 596d1c58fb2d5b9ef8ad7590353e32fc757301a9 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 13:47:30 +0100 Subject: [PATCH 11/31] back to basic --- Dockerfile | 3 +-- docker-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a99e3b1..d4b9bf2 100755 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,7 @@ RUN chmod +x /getpaperserver.sh RUN /getpaperserver.sh ${version} # Run paperclip and obtain patched jar -RUN java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 - +RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 # Copy built jar RUN mv /opt/minecraft/cache/*.jar paperspigot.jar diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 194d5c5..d17f872 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -20,4 +20,4 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then fi export HOME=/home/$DOCKER_USER -exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -Dcom.mojang.eula.agree=true -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar nogui +exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui \ No newline at end of file From fc93a5c8a370e19e5964779420ac3497308ace24 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 14:03:45 +0100 Subject: [PATCH 12/31] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4b9bf2..3ca049d 100755 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN /getpaperserver.sh ${version} RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 # Copy built jar -RUN mv /opt/minecraft/cache/*.jar paperspigot.jar +RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar ######################################################## ############## Running environment ##################### From 9e825e107327b3bff9e69f31349e18a5ddab1ed3 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 14:07:48 +0100 Subject: [PATCH 13/31] Update getpaperserver.sh --- getpaperserver.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/getpaperserver.sh b/getpaperserver.sh index 88ef785..044d768 100755 --- a/getpaperserver.sh +++ b/getpaperserver.sh @@ -3,4 +3,5 @@ Version=$1 BuildJSON=$(curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" https://papermc.io/api/v2/projects/paper/versions/$Version) Build=$(echo "$BuildJSON" | rev | cut -d, -f 1 | cut -d] -f 2 | rev) Build=$(($Build + 0)) +echo $1#$Build curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" -o paperclip.jar "https://papermc.io/api/v2/projects/paper/versions/$Version/builds/$Build/downloads/paper-$Version-$Build.jar" \ No newline at end of file From 508e6322a2419ab3e72cb14bf5f3486f9af2c16c Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 14:17:48 +0100 Subject: [PATCH 14/31] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3ca049d..72727b1 100755 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ FROM openjdk:17-alpine AS runtime WORKDIR /data # Obtain runable jar from build stage -COPY --from=build /opt/minecraft/paperspigot.jar /opt/minecraft/paperspigot.jar +# COPY --from=build /opt/minecraft/paperspigot.jar /opt/minecraft/paperspigot.jar # Install and run rcon ARG RCON_CLI_VER=1.4.8 From 08072c3434c8e6fcac28d6bce6dc2670a95109ca Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 14:41:50 +0100 Subject: [PATCH 15/31] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 72727b1..28fcc66 100755 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN /getpaperserver.sh ${version} RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 # Copy built jar -RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar +#RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar ######################################################## ############## Running environment ##################### @@ -32,7 +32,7 @@ FROM openjdk:17-alpine AS runtime WORKDIR /data # Obtain runable jar from build stage -# COPY --from=build /opt/minecraft/paperspigot.jar /opt/minecraft/paperspigot.jar +COPY --from=build /opt/minecraft/paperspigot.jar /opt/minecraft/paperspigot.jar # Install and run rcon ARG RCON_CLI_VER=1.4.8 From fa802f0815b0835fcd400cb72bc06e0691a12a90 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 14:46:23 +0100 Subject: [PATCH 16/31] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28fcc66..8a37631 100755 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ FROM openjdk:17-alpine AS runtime WORKDIR /data # Obtain runable jar from build stage -COPY --from=build /opt/minecraft/paperspigot.jar /opt/minecraft/paperspigot.jar +COPY --from=build /opt/minecraft/paperclip.jar /opt/minecraft/paperspigot.jar # Install and run rcon ARG RCON_CLI_VER=1.4.8 From 38374e6b0d95d9601db9fcafc7960575a053ead1 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 14:57:58 +0100 Subject: [PATCH 17/31] eula --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8a37631..bdb16ac 100755 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ ARG memory_size=3G ENV MEMORYSIZE=$memory_size # Set Java Flags -ARG java_flags="-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=mcflags.emc.gs" +ARG java_flags="-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=mcflags.emc.gs -Dcom.mojang.eula.agree=true" ENV JAVAFLAGS=$java_flags WORKDIR /data From 22d95389891403131a1d4e3e1e9c4a8f5f45feff Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 1 Dec 2021 15:37:46 +0100 Subject: [PATCH 18/31] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 77a2226..1302e38 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Docker Minecraft PaperMC Server 1.17 +# Docker Minecraft PaperMC Server 1.18 -Docker Minecraft PaperMC server 1.17.x, 1.16.x, 1.15.2, 1.14.4 (legacy) or 1.13.2 (legacy) +Docker Minecraft PaperMC server 1.18.x, 1.17.x, 1.16.x, 1.15.2, 1.14.4 (legacy) or 1.13.2 (legacy) ## Quick Start From 0f7f4b64ca91920bfc2f8ae16ab4769dfea0811a Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 8 Dec 2021 09:06:07 +0100 Subject: [PATCH 19/31] Update Dockerfile --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bdb16ac..26bcf35 100755 --- a/Dockerfile +++ b/Dockerfile @@ -20,9 +20,6 @@ RUN /getpaperserver.sh ${version} # Run paperclip and obtain patched jar RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 -# Copy built jar -#RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar - ######################################################## ############## Running environment ##################### ######################################################## From c442d208bbe22422fe5b40a6ca778974bab8a90a Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 8 Dec 2021 09:13:49 +0100 Subject: [PATCH 20/31] Update README.md --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1302e38..c186b95 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,16 @@ -# Docker Minecraft PaperMC Server 1.18 +# Docker Minecraft JAVA PaperMC Server 1.18 -Docker Minecraft PaperMC server 1.18.x, 1.17.x, 1.16.x, 1.15.2, 1.14.4 (legacy) or 1.13.2 (legacy) +Docker Minecraft PaperMC server 1.18, 1.17.x, 1.16.x, 1.15.2, 1.14.4 (legacy) or 1.13.2 (legacy) +# Minecraft 1.18 beta + + docker pull marctv/minecraft-papermc-server:1.18 + +See https://github.com/mtoensing/Docker-Minecraft-PaperMC-Server/issues/33 for more information. + +**Experimental test builds for 1.18. Use with extreme caution! Backups are mandatory.** + ## Quick Start ```sh docker pull marctv/minecraft-papermc-server From 6690b8e81f088a85062d524c2c10a2687c23700f Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 8 Dec 2021 18:00:48 +0100 Subject: [PATCH 21/31] Use openjdk:17 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26bcf35..c7961f9 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ######################################################## ############## We use a java base image ################ ######################################################## -FROM openjdk:17-alpine AS build +FROM openjdk:17 AS build RUN apk --no-cache add curl LABEL Marc Tönsing @@ -23,7 +23,7 @@ RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/pape ######################################################## ############## Running environment ##################### ######################################################## -FROM openjdk:17-alpine AS runtime +FROM openjdk:17 AS runtime # Working directory WORKDIR /data From aee55b60cdfff872cee92c3e07fed398a100b21a Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Wed, 8 Dec 2021 18:03:10 +0100 Subject: [PATCH 22/31] revert openjdk:17 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c7961f9..26bcf35 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ######################################################## ############## We use a java base image ################ ######################################################## -FROM openjdk:17 AS build +FROM openjdk:17-alpine AS build RUN apk --no-cache add curl LABEL Marc Tönsing @@ -23,7 +23,7 @@ RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/pape ######################################################## ############## Running environment ##################### ######################################################## -FROM openjdk:17 AS runtime +FROM openjdk:17-alpine AS runtime # Working directory WORKDIR /data From 88ba332169e8594b2dfaa809dcddf7f493dfe4d6 Mon Sep 17 00:00:00 2001 From: Joscha Eckert <34318751+josxha@users.noreply.github.com> Date: Wed, 8 Dec 2021 17:20:17 +0100 Subject: [PATCH 23/31] use zulu-openjdk 17 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26bcf35..f84c8b3 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ######################################################## ############## We use a java base image ################ ######################################################## -FROM openjdk:17-alpine AS build +FROM azul/zulu-openjdk-alpine:17-jre AS build RUN apk --no-cache add curl LABEL Marc Tönsing @@ -23,7 +23,7 @@ RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/pape ######################################################## ############## Running environment ##################### ######################################################## -FROM openjdk:17-alpine AS runtime +FROM azul/zulu-openjdk-alpine:17-jre AS runtime # Working directory WORKDIR /data From e4b96c67c5d9838e5f3dda41579a560ef8aeb19e Mon Sep 17 00:00:00 2001 From: Joscha Eckert <34318751+josxha@users.noreply.github.com> Date: Wed, 8 Dec 2021 17:23:45 +0100 Subject: [PATCH 24/31] fix paperclip --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f84c8b3..0b2e226 100755 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN chmod +x /getpaperserver.sh RUN /getpaperserver.sh ${version} # Run paperclip and obtain patched jar -RUN /opt/openjdk-17/bin/java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 +RUN java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0 ######################################################## ############## Running environment ##################### From 15d71eccd58c1d2f30fbd8f4c8c0194ea968b945 Mon Sep 17 00:00:00 2001 From: Joscha Eckert <34318751+josxha@users.noreply.github.com> Date: Wed, 8 Dec 2021 17:37:51 +0100 Subject: [PATCH 25/31] fix entrypoint --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index d17f872..7d51836 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -20,4 +20,4 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then fi export HOME=/home/$DOCKER_USER -exec su-exec $DOCKER_USER /opt/openjdk-17/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui \ No newline at end of file +exec su-exec $DOCKER_USER java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui From ec856f778e5d6f332a558460b432e274d4c600f3 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Fri, 10 Dec 2021 09:32:31 +0100 Subject: [PATCH 26/31] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0b2e226..2b14035 100755 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ ARG memory_size=3G ENV MEMORYSIZE=$memory_size # Set Java Flags -ARG java_flags="-XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=mcflags.emc.gs -Dcom.mojang.eula.agree=true" +ARG java_flags="-Dlog4j2.formatMsgNoLookups=true -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis=200 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=30 -XX:G1MaxNewSizePercent=40 -XX:G1HeapRegionSize=8M -XX:G1ReservePercent=20 -XX:G1HeapWastePercent=5 -XX:G1MixedGCCountTarget=4 -XX:InitiatingHeapOccupancyPercent=15 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:SurvivorRatio=32 -XX:+PerfDisableSharedMem -XX:MaxTenuringThreshold=1 -Dusing.aikars.flags=mcflags.emc.gs -Dcom.mojang.eula.agree=true" ENV JAVAFLAGS=$java_flags WORKDIR /data From 152b6c6cdef573513d087909892071ea022bd1a1 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Fri, 10 Dec 2021 11:46:15 +0100 Subject: [PATCH 27/31] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index c186b95..224a73f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Docker Minecraft JAVA PaperMC Server 1.18 -Docker Minecraft PaperMC server 1.18, 1.17.x, 1.16.x, 1.15.2, 1.14.4 (legacy) or 1.13.2 (legacy) - +Docker Minecraft PaperMC server for 1.18, 1.17 and 1.16 (deprecated!) # Minecraft 1.18 beta From 4298dd6ad2e66e776bdb01b02e679e26e6990e43 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Sat, 11 Dec 2021 09:34:43 +0100 Subject: [PATCH 28/31] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2b14035..85fa231 100755 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apk --no-cache add curl LABEL Marc Tönsing -ARG version=1.18 +ARG version=1.18.1 ######################################################## From 89f8f72839621b49de20f9e8985aea5de4271e04 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Sat, 11 Dec 2021 09:36:28 +0100 Subject: [PATCH 29/31] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 85fa231..2b14035 100755 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apk --no-cache add curl LABEL Marc Tönsing -ARG version=1.18.1 +ARG version=1.18 ######################################################## From 6a098318de87c590203168813911b119c67a66a2 Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Sat, 11 Dec 2021 12:51:31 +0100 Subject: [PATCH 30/31] Added jq for more robust json parsing --- Dockerfile | 2 +- getpaperserver.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b14035..4eacd74 100755 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ############## We use a java base image ################ ######################################################## FROM azul/zulu-openjdk-alpine:17-jre AS build -RUN apk --no-cache add curl +RUN apk add curl jq LABEL Marc Tönsing diff --git a/getpaperserver.sh b/getpaperserver.sh index 044d768..9f075e5 100755 --- a/getpaperserver.sh +++ b/getpaperserver.sh @@ -1,7 +1,9 @@ -# Script by https://github.com/TheRemote/RaspberryPiMinecraft/blob/master/SetupMinecraft.sh +# original script by https://github.com/TheRemote/RaspberryPiMinecraft/blob/master/SetupMinecraft.sh +# modified with jq Version=$1 BuildJSON=$(curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" https://papermc.io/api/v2/projects/paper/versions/$Version) -Build=$(echo "$BuildJSON" | rev | cut -d, -f 1 | cut -d] -f 2 | rev) -Build=$(($Build + 0)) +Build=$(echo "$BuildJSON" | jq .builds[-1]) +curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" -o paperclip.jar "https://papermc.io/api/v2/projects/paper/versions/$Version/builds/$Build/downloads/paper-$Version-$Build.jar" +echo ----------------- echo $1#$Build -curl -H "Accept-Encoding: identity" -H "Accept-Language: en" -L -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4.212 Safari/537.36" -o paperclip.jar "https://papermc.io/api/v2/projects/paper/versions/$Version/builds/$Build/downloads/paper-$Version-$Build.jar" \ No newline at end of file +echo ----------------- \ No newline at end of file From 1a4621c26b25322bc358fbd8fc96cd126eb90cde Mon Sep 17 00:00:00 2001 From: Marc Toensing Date: Sat, 11 Dec 2021 13:07:46 +0100 Subject: [PATCH 31/31] 1.18.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4eacd74..b4f6a0e 100755 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apk add curl jq LABEL Marc Tönsing -ARG version=1.18 +ARG version=1.18.1 ########################################################