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

Update to use Java16

Browse source 
1.17 will require the move to java16, and my important plugins (Floodgate and Geyser) support it now, so, to test!
This commit is contained in:
jace 2021-06-01 15:13:25 -07:00
parent c524ae4e57
commit 194be22d0a
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Dockerfile
View file

@ -1,7 +1,7 @@
######################################################## ########################################################
############## We use a java base image ################ ############## We use a java base image ################
######################################################## ########################################################
FROM openjdk:11 AS build FROM openjdk:16-alpine AS build
MAINTAINER Marc Tönsing <marc@marc.tv> MAINTAINER Marc Tönsing <marc@marc.tv>
@ -14,7 +14,7 @@ WORKDIR /opt/minecraft
ADD ${PAPERSPIGOT_CI_URL} paperclip.jar ADD ${PAPERSPIGOT_CI_URL} paperclip.jar
# Run paperclip and obtain patched jar # Run paperclip and obtain patched jar
RUN /usr/local/openjdk-11/bin/java -jar /opt/minecraft/paperclip.jar; exit 0 RUN /opt/openjdk-16/bin/java -jar /opt/minecraft/paperclip.jar; exit 0
# Copy built jar # Copy built jar
RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar
@ -22,7 +22,7 @@ RUN mv /opt/minecraft/cache/patched*.jar paperspigot.jar
######################################################## ########################################################
############## Running environment ##################### ############## Running environment #####################
######################################################## ########################################################
FROM openjdk:11 AS runtime FROM openjdk:16-alpine AS runtime
# Working directory # Working directory
WORKDIR /data WORKDIR /data
@ -53,16 +53,14 @@ ENV JAVAFLAGS=$java_flags
WORKDIR /data WORKDIR /data
COPY /docker-entrypoint.sh /usr/local/bin/ COPY /docker-entrypoint.sh /opt/minecraft
RUN chmod +x /usr/local/bin/docker-entrypoint.sh RUN chmod +x /opt/minecraft/docker-entrypoint.sh
# Install gosu # Install gosu
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apk update; \
apt-get install -y gosu; \ apk add --no-cache su-exec;
rm -rf /var/lib/apt/lists/*; \
# verify that the binary works
gosu nobody true
# Entrypoint # Entrypoint
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] ENTRYPOINT ["/opt/minecraft/docker-entrypoint.sh"]

8
docker-entrypoint.sh
View file

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
set -e set -e
DOCKER_USER='dockeruser' DOCKER_USER='dockeruser'
@ -11,8 +11,8 @@ if ! id "$DOCKER_USER" >/dev/null 2>&1; then
GROUP_ID=${PGID:-9001} GROUP_ID=${PGID:-9001}
echo "Starting with $USER_ID:$GROUP_ID (UID:GID)" echo "Starting with $USER_ID:$GROUP_ID (UID:GID)"
groupadd -f -g $GROUP_ID $DOCKER_GROUP addgroup -g $GROUP_ID $DOCKER_GROUP
useradd --shell /bin/bash -u $USER_ID -g $GROUP_ID -o -c "" -m $DOCKER_USER adduser -s /bin/sh -u $USER_ID -G $DOCKER_GROUP -D $DOCKER_USER
chown -vR $USER_ID:$GROUP_ID /opt/minecraft chown -vR $USER_ID:$GROUP_ID /opt/minecraft
chmod -vR ug+rwx /opt/minecraft chmod -vR ug+rwx /opt/minecraft
@ -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 gosu $DOCKER_USER /usr/local/openjdk-11/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui exec su-exec $DOCKER_USER /opt/openjdk-16/bin/java -jar -Xms$MEMORYSIZE -Xmx$MEMORYSIZE $JAVAFLAGS /opt/minecraft/paperspigot.jar --nojline nogui