From 9b4fd4824434a181aac22bd0005f5be62507c0da Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 28 Jan 2022 22:21:07 -0600 Subject: [PATCH] Just exit container when PATH is mismatched --- .github/workflows/build-multiarch.yml | 1 + scripts/start-configuration | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 4f4f9584..6309111f 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -94,6 +94,7 @@ jobs: tags: ${{ env.IMAGE_TO_TEST }} # ensure latest base image is used pull: true + # load into daemon for test usage in next step load: true push: false build-args: | diff --git a/scripts/start-configuration b/scripts/start-configuration index e1a2c099..8e422ad5 100755 --- a/scripts/start-configuration +++ b/scripts/start-configuration @@ -66,9 +66,12 @@ if [[ $RCON_PASSWORD_FILE ]]; then log "" fi +# Some Docker management UIs grab all the image declared variables and present them for configuration. +# When upgrading images across Java versions, that creates a mismatch in PATH's expected by base image. if ! which java > /dev/null; then - log "Fixing PATH to include java" - PATH="${PATH}:/opt/java/openjdk/bin" + log "ERROR: PATH should not be explicitly passed into the container" + log " Remove configuration of that variable." + exit 1 fi export VERSIONS_JSON=https://launchermeta.mojang.com/mc/game/version_manifest.json