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

Switch to a more standard base image, to fix a crash

Browse source
This commit is contained in:
Ryan Voots 2024-08-01 08:13:25 -04:00
parent 9f8fd25bf2
commit 54888cd27f
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Dockerfile
View file

@ -1,8 +1,10 @@
######################################################## ########################################################
############## We use a java base image ################ ############## We use a java base image ################
######################################################## ########################################################
FROM azul/zulu-openjdk-alpine:21-jre AS build FROM debian:sid AS build
RUN apk add curl jq bash RUN ls -lah /etc/apt/sources.list.d/
RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list.d/debian.sources
RUN apt update && apt install -y curl jq bash openjdk-21-jdk openjdk-21-jre
LABEL Marc Tönsing <marc@marc.tv> LABEL Marc Tönsing <marc@marc.tv>
@ -24,8 +26,9 @@ RUN java -Dpaperclip.patchonly=true -jar /opt/minecraft/paperclip.jar; exit 0
######################################################## ########################################################
############## Running environment ##################### ############## Running environment #####################
######################################################## ########################################################
FROM azul/zulu-openjdk-alpine:21-jre AS runtime FROM debian:sid AS runtime
RUN apk add curl jq bash RUN sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list.d/debian.sources
RUN apt update && apt install -y curl jq bash openjdk-21-jre openjdk-21-jdk sudo
# Working directory # Working directory
WORKDIR /data WORKDIR /data
@ -60,9 +63,9 @@ COPY /docker-entrypoint.sh /opt/minecraft
RUN chmod +x /opt/minecraft/docker-entrypoint.sh RUN chmod +x /opt/minecraft/docker-entrypoint.sh
# Install gosu # Install gosu
RUN set -eux; \ #RUN set -eux; \
apk update; \ # apk update; \
apk add --no-cache su-exec; # apk add --no-cache su-exec;
# Entrypoint # Entrypoint
ENTRYPOINT ["/opt/minecraft/docker-entrypoint.sh"] ENTRYPOINT ["/opt/minecraft/docker-entrypoint.sh"]

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