simcop2387/papermc-build
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity

Merge branch '1.18' into beta

Browse source
This commit is contained in:
Marc Toensing 2021-12-10 09:33:08 +01:00
commit e6d8382367
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -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 <marc@marc.tv>
@ -18,12 +18,12 @@ 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 openjdk:17-alpine AS runtime
FROM azul/zulu-openjdk-alpine:17-jre AS runtime
# Working directory
WORKDIR /data
@ -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

2
docker-entrypoint.sh
View file

@ -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 java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui