From 99159293407118c58c5f89c2ab7fb5ed63533842 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 6 Mar 2021 16:53:46 -0600 Subject: [PATCH 1/9] ci: Added java15-openj9 --- .github/workflows/build-multiarch.yml | 1 + docker-versions-create.sh | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index f5ee8f6c..76307c28 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -6,6 +6,7 @@ on: - java8-multiarch - multiarch-latest - java15 + - java15-openj9 - test/multiarch/* tags: - "[0-9]+.[0-9]+.[0-9]+-multiarch" diff --git a/docker-versions-create.sh b/docker-versions-create.sh index 93c4a9d6..59b5ee34 100755 --- a/docker-versions-create.sh +++ b/docker-versions-create.sh @@ -1,7 +1,17 @@ #!/bin/bash #set -x # Use this variable to indicate a list of branches that docker hub is watching -branches_list=('java8' 'java8-multiarch' 'openj9' 'openj9-11' 'adopt11' 'java15' 'multiarch' 'multiarch-latest') +branches_list=( + 'java8' + 'java8-multiarch' + 'openj9' + 'openj9-11' + 'adopt11' + 'java15' + 'java15-openj9' + 'multiarch' + 'multiarch-latest' + ) function TrapExit { echo "Checking out back in master" From 6e2b3ae0c7e8b6635a3bb42c6450fab7782b4496 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 6 Mar 2021 17:26:08 -0600 Subject: [PATCH 2/9] docs: Added java15-openj9 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3a0adec9..a17d5035 100644 --- a/README.md +++ b/README.md @@ -166,6 +166,7 @@ To use a different version of Java, please use a docker tag to run your Minecraf | java8 | 8 | Alpine | Hotspot | amd64 | | java8-multiarch | 8 | Debian | Hotspot | amd64,arm64,armv7 | | java15 | 15 | Debian | Hotspot | amd64,arm64,armv7 | +| java15-openj9 | 15 | Debian | OpenJ9 | amd64,arm64 | | adopt11 | 11 | Alpine | Hotspot | amd64 | | openj9 | 8 | Alpine | OpenJ9 | amd64 | | openj9-11 | 11 | Alpine | OpenJ9 | amd64 | From 6c6bf030c5f5ee19f3ebafcf790689b2493163aa Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sun, 7 Mar 2021 13:06:45 -0600 Subject: [PATCH 3/9] docs: Added troubleshooting info for rpi #795 --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a17d5035..ff182338 100644 --- a/README.md +++ b/README.md @@ -1196,8 +1196,10 @@ When the container is signalled to stop, the Minecraft process wrapper will atte ## Running on RaspberryPi -To run this image on a RaspberryPi 3 B+, 4, or newer, use the image tag +To run this image on a RaspberryPi 3 B+, 4, or newer, use any of the image tags [list in the Java version section](#running-minecraft-server-on-different-java-version) that specify `armv7` for the architecture, such as itzg/minecraft-server:multiarch > NOTE: you may need to lower the memory allocation, such as `-e MEMORY=750m` + +> If experiencing issues such as "sleep: cannot read realtime clock: Operation not permitted", ensure `libseccomp` is up to date on your host. In some cases adding `:Z` flag to the `/data` mount may be needed, [but use cautiously](https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label). From d3bd697cb2fad480779c29f92ce382a2bb90d4e3 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Tue, 9 Mar 2021 22:05:21 -0600 Subject: [PATCH 4/9] Fixed warning reported when no paper jars to remove --- start-deployPaper | 1 + 1 file changed, 1 insertion(+) diff --git a/start-deployPaper b/start-deployPaper index 6058be2b..1427bb7e 100644 --- a/start-deployPaper +++ b/start-deployPaper @@ -57,6 +57,7 @@ else fi log "Removing old PaperMC versions ..." + shopt -s nullglob for f in paper-*.jar; do [[ $f != $SERVER ]] && rm $f done From cd3ea7fd2e4cbb7851dcb33108738facaf3ef0ca Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Tue, 9 Mar 2021 22:13:33 -0600 Subject: [PATCH 5/9] Upgraded mc-monitor to 0.7.0 #795 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c6d9c63c..366c5063 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ - --var version=0.1.7 --var app=mc-monitor --file {{.app}} \ + --var version=0.7.0 --var app=mc-monitor --file {{.app}} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ From 6fa827e9a11f1d6c59ce4b40af2857b7a775f8cb Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Thu, 11 Mar 2021 15:08:26 -0600 Subject: [PATCH 6/9] Fixed usage of EXTRA_ARGS #798 --- start-minecraftFinalSetup | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup index 268a6698..40c1358c 100644 --- a/start-minecraftFinalSetup +++ b/start-minecraftFinalSetup @@ -61,15 +61,14 @@ for j in $JSON_FILES; do fi done -EXTRA_ARGS="" # Optional disable console if versionLessThan 1.14 && [[ ${CONSOLE,,} = false ]]; then - EXTRA_ARGS+="--noconsole" + EXTRA_ARGS+=" --noconsole" fi # Optional disable GUI for headless servers if [[ ${GUI} = false || ${GUI} = FALSE ]]; then - EXTRA_ARGS="${EXTRA_ARGS} nogui" + EXTRA_ARGS+=" nogui" fi # put these prior JVM_OPTS at the end to give any memory settings there higher precedence From 209c6e6dabf59772039f2fa3c1b0c61379668ef9 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Thu, 11 Mar 2021 15:36:34 -0600 Subject: [PATCH 7/9] Added explicit -dir for Fabric installer #797 --- start-deployFabric | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/start-deployFabric b/start-deployFabric index e933b6f7..4734e0ea 100644 --- a/start-deployFabric +++ b/start-deployFabric @@ -54,7 +54,10 @@ if [[ ! -e $installMarker ]]; then tries=3 set +e while ((--tries >= 0)); do - java -jar $FABRIC_INSTALLER server -mcversion $VANILLA_VERSION -downloadMinecraft + java -jar $FABRIC_INSTALLER server \ + -mcversion $VANILLA_VERSION \ + -downloadMinecraft \ + -dir /data if [[ $? == 0 ]]; then break fi From 3c77abbbab2df9c86d24a542321434e9fd909046 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Thu, 11 Mar 2021 16:21:59 -0600 Subject: [PATCH 8/9] Added debug output for deployForge and minecraftFinalSetup #799 --- start-deployForge | 1 + start-minecraftFinalSetup | 1 + 2 files changed, 2 insertions(+) diff --git a/start-deployForge b/start-deployForge index f6b273eb..c7f14e6d 100644 --- a/start-deployForge +++ b/start-deployForge @@ -3,6 +3,7 @@ . ${SCRIPTS:-/}start-utils export TYPE=FORGE : ${FORGEVERSION:=RECOMMENDED} +isDebugging && set -x if [[ -z $FORGE_INSTALLER && -z $FORGE_INSTALLER_URL ]]; then norm=$VANILLA_VERSION diff --git a/start-minecraftFinalSetup b/start-minecraftFinalSetup index 40c1358c..fc3cfa1d 100644 --- a/start-minecraftFinalSetup +++ b/start-minecraftFinalSetup @@ -1,6 +1,7 @@ #!/bin/bash . ${SCRIPTS:-/}start-utils +isDebugging && set -x if [ -n "$OPS" ]; then log "Updating ops" From 44138564b0a4590c8dbde767c8d1df53d1153cc0 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Thu, 11 Mar 2021 16:29:21 -0600 Subject: [PATCH 9/9] Added debug output for deployCustom #799 --- start-deployCustom | 1 + 1 file changed, 1 insertion(+) diff --git a/start-deployCustom b/start-deployCustom index e2939ab8..156ee9ba 100644 --- a/start-deployCustom +++ b/start-deployCustom @@ -1,6 +1,7 @@ #!/bin/bash . ${SCRIPTS:-/}start-utils +isDebugging && set -x if isURL ${CUSTOM_SERVER}; then filename=$(basename ${CUSTOM_SERVER})