From 326c43e544448c5e26b9fb19dfec4760f3cf071e Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Sat, 8 Apr 2023 19:03:46 -0500 Subject: [PATCH] autocf: use VERSION resolved from modpack (#2072) --- Dockerfile | 2 +- scripts/start-deployAutoCF | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35fc72f3..e29316aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --var version=0.1.1 --var app=maven-metadata-release --file {{.app}} \ --from https://github.com/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz -ARG MC_HELPER_VERSION=1.26.2 +ARG MC_HELPER_VERSION=1.27.3 ARG MC_HELPER_BASE_URL=https://github.com/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION} RUN curl -fsSL ${MC_HELPER_BASE_URL}/mc-image-helper-${MC_HELPER_VERSION}.tgz \ | tar -C /usr/share -zxf - \ diff --git a/scripts/start-deployAutoCF b/scripts/start-deployAutoCF index 639668a4..e2939218 100644 --- a/scripts/start-deployAutoCF +++ b/scripts/start-deployAutoCF @@ -65,5 +65,8 @@ set -a # shellcheck disable=SC1090 source "${resultsFile}" set +a +# grab the version resolved from modpack +VANILLA_VERSION="$VERSION" +export VANILLA_VERSION exec "${SCRIPTS:-/}start-setupWorld" "$@"