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

Merge branch 'paper-1.18'

Browse source
This commit is contained in:
Marc Toensing 2022-01-02 17:12:33 +01:00
commit ce4b8674ce
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Dockerfile
View file

@ -1,12 +1,12 @@
######################################################## ########################################################
############## We use a java base image ################ ############## We use a java base image ################
######################################################## ########################################################
FROM openjdk:16-alpine AS build FROM azul/zulu-openjdk-alpine:17-jre AS build
RUN apk --no-cache add curl RUN apk add curl jq
LABEL Marc Tönsing <marc@marc.tv> LABEL Marc Tönsing <marc@marc.tv>
ARG version=1.17.1 ARG version=1.18.1
######################################################## ########################################################
@ -18,21 +18,18 @@ RUN chmod +x /getpaperserver.sh
RUN /getpaperserver.sh ${version} RUN /getpaperserver.sh ${version}
# Run paperclip and obtain patched jar # Run paperclip and obtain patched jar
RUN /opt/openjdk-16/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
######################################################## ########################################################
############## Running environment ##################### ############## Running environment #####################
######################################################## ########################################################
FROM openjdk:16-alpine AS runtime FROM azul/zulu-openjdk-alpine:17-jre AS runtime
# Working directory # Working directory
WORKDIR /data WORKDIR /data
# Obtain runable jar from build stage # 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 # Install and run rcon
ARG RCON_CLI_VER=1.4.8 ARG RCON_CLI_VER=1.4.8

2
docker-entrypoint.sh
View file

@ -20,4 +20,4 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then
fi fi
export HOME=/home/$DOCKER_USER 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

11
getpaperserver.sh
View file

@ -1,6 +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 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) 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=$(echo "$BuildJSON" | jq .builds[-1])
Build=$(($Build + 0)) 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"
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
echo -----------------