mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-11-22 06:34:21 +00:00
Fix autopause not working in java8 (#2025)
This commit is contained in:
1 parent
7f3c3b2d64
commit
e7084c233e
4 files changed
+27
-12
No files matched your search
+7
-12
@@ -3,11 +3,17 @@
|
|||||||
ARG BASE_IMAGE=eclipse-temurin:17-jre-focal
|
ARG BASE_IMAGE=eclipse-temurin:17-jre-focal
|
||||||
FROM ${BASE_IMAGE}
|
FROM ${BASE_IMAGE}
|
||||||
|
|
||||||
|
# hook into docker BuildKit --platform support
|
||||||
|
# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
|
||||||
|
ARG TARGETOS
|
||||||
|
ARG TARGETARCH
|
||||||
|
ARG TARGETVARIANT
|
||||||
|
|
||||||
# CI system should set this to a hash or git revision of the build directory and it's contents to
|
# CI system should set this to a hash or git revision of the build directory and it's contents to
|
||||||
# ensure consistent cache updates.
|
# ensure consistent cache updates.
|
||||||
ARG BUILD_FILES_REV=1
|
ARG BUILD_FILES_REV=1
|
||||||
RUN --mount=target=/build,source=build \
|
RUN --mount=target=/build,source=build \
|
||||||
REV=${BUILD_FILES_REV} /build/run.sh install-packages
|
REV=${BUILD_FILES_REV} TARGET=${TARGETARCH}${TARGETVARIANT} /build/run.sh install-packages
|
||||||
|
|
||||||
RUN --mount=target=/build,source=build \
|
RUN --mount=target=/build,source=build \
|
||||||
REV=${BUILD_FILES_REV} /build/run.sh setup-user
|
REV=${BUILD_FILES_REV} /build/run.sh setup-user
|
||||||
@@ -16,12 +22,6 @@ COPY --chmod=644 files/sudoers* /etc/sudoers.d
|
|||||||
|
|
||||||
EXPOSE 25565
|
EXPOSE 25565
|
||||||
|
|
||||||
# hook into docker BuildKit --platform support
|
|
||||||
# see https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
|
|
||||||
ARG TARGETOS
|
|
||||||
ARG TARGETARCH
|
|
||||||
ARG TARGETVARIANT
|
|
||||||
|
|
||||||
ARG EASY_ADD_VER=0.7.1
|
ARG EASY_ADD_VER=0.7.1
|
||||||
ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
|
ADD https://github.com/itzg/easy-add/releases/download/${EASY_ADD_VER}/easy-add_${TARGETOS}_${TARGETARCH}${TARGETVARIANT} /usr/bin/easy-add
|
||||||
RUN chmod +x /usr/bin/easy-add
|
RUN chmod +x /usr/bin/easy-add
|
||||||
@@ -52,11 +52,6 @@ RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \
|
|||||||
| tar -C /usr/share -zxf - \
|
| tar -C /usr/share -zxf - \
|
||||||
&& ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
|
&& ln -s /usr/share/mc-image-helper-${MC_HELPER_VERSION}/bin/mc-image-helper /usr/bin
|
||||||
|
|
||||||
# Install modified knockd
|
|
||||||
ADD https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-${TARGETARCH}${TARGETVARIANT}.tar.gz /tmp/knock.tar.gz
|
|
||||||
RUN tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
|
|
||||||
RUN find /usr/lib -name 'libpcap.so.0.8' -execdir cp '{}' libpcap.so.1 \;
|
|
||||||
|
|
||||||
VOLUME ["/data"]
|
VOLUME ["/data"]
|
||||||
WORKDIR /data
|
WORKDIR /data
|
||||||
|
|
||||||
|
|||||||
@@ -25,3 +25,8 @@ apk add --no-cache -U \
|
|||||||
zstd \
|
zstd \
|
||||||
nfs-utils \
|
nfs-utils \
|
||||||
libpcap
|
libpcap
|
||||||
|
|
||||||
|
# Patched knockd
|
||||||
|
curl -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-alpine-amd64.tar.gz
|
||||||
|
tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
|
||||||
|
ln -s /usr/local/sbin/knockd /usr/sbin/knockd
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
export TARGET
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
microdnf install dnf -y
|
microdnf install dnf -y
|
||||||
@@ -36,3 +38,8 @@ dnf install -y ImageMagick \
|
|||||||
libpcap
|
libpcap
|
||||||
|
|
||||||
bash /build/ol/install-gosu.sh
|
bash /build/ol/install-gosu.sh
|
||||||
|
|
||||||
|
# Patched knockd
|
||||||
|
curl -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz
|
||||||
|
tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
|
||||||
|
ln -s /usr/local/sbin/knockd /usr/sbin/knockd
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
export TARGET
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
apt-get update
|
apt-get update
|
||||||
@@ -27,3 +29,9 @@ apt-get install -y \
|
|||||||
libpcap0.8
|
libpcap0.8
|
||||||
|
|
||||||
apt-get clean
|
apt-get clean
|
||||||
|
|
||||||
|
# Patched knockd
|
||||||
|
curl -o /tmp/knock.tar.gz https://github.com/Metalcape/knock/releases/download/0.8.1/knock-0.8.1-$TARGET.tar.gz
|
||||||
|
tar -xf /tmp/knock.tar.gz -C /usr/local/ && rm /tmp/knock.tar.gz
|
||||||
|
ln -s /usr/local/sbin/knockd /usr/sbin/knockd
|
||||||
|
find /usr/lib -name 'libpcap.so.0.8' -execdir cp '{}' libpcap.so.1 \;
|
||||||
Reference in new issue
Block a user