diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 155deebc..99faf6f8 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -80,25 +80,25 @@ jobs: platforms: linux/amd64,linux/arm/v7,linux/arm64 mcVersion: 1.12.2 # Pin version for Java 8 - mcHelperVersion: 1.42.1 +# mcHelperVersion: 1.46.0 - variant: java8-graalvm-ce baseImage: ghcr.io/graalvm/graalvm-ce:java8 platforms: linux/amd64 mcVersion: 1.12.2 # Pin version for Java 8 - mcHelperVersion: 1.42.1 +# mcHelperVersion: 1.46.0 - variant: java8-jdk baseImage: eclipse-temurin:8u312-b07-jdk-focal platforms: linux/amd64,linux/arm64 mcVersion: 1.12.2 # Pin version for Java 8 - mcHelperVersion: 1.42.1 +# mcHelperVersion: 1.46.0 - variant: java8-openj9 baseImage: ibm-semeru-runtimes:open-8u312-b07-jre platforms: linux/amd64,linux/arm64 mcVersion: 1.12.2 # Pin version for Java 8 - mcHelperVersion: 1.42.1 +# mcHelperVersion: 1.46.0 env: IMAGE_TO_TEST: "${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}" HAS_IMAGE_REPO_ACCESS: ${{ secrets.DOCKER_USER != '' && secrets.DOCKER_PASSWORD != '' }} diff --git a/Dockerfile b/Dockerfile index 96fd185c..fa9d7694 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \ --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz -ARG MC_HELPER_VERSION=1.45.0 +ARG MC_HELPER_VERSION=1.46.0 ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} # used for cache busting local copy of mc-image-helper ARG MC_HELPER_REV=1