diff --git a/Dockerfile b/Dockerfile index 63f037ad..bd0df84f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,7 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \ --from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz # renovate: datasource=github-releases packageName=itzg/mc-image-helper versioning=loose -ARG MC_HELPER_VERSION=1.55.3 +ARG MC_HELPER_VERSION=1.55.4 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 diff --git a/scripts/start-configuration b/scripts/start-configuration index 7929bd65..13838dfa 100755 --- a/scripts/start-configuration +++ b/scripts/start-configuration @@ -156,7 +156,11 @@ export DECLARED_TYPE=${TYPE^^} export DECLARED_VERSION="$VERSION" if isTrue "${VERSION_FROM_MODRINTH_PROJECTS:-}" && [[ ${MODRINTH_PROJECTS:-} ]]; then - if ! VERSION=$(mc-image-helper version-from-modrinth-projects --projects "${MODRINTH_PROJECTS}"); then + args=() + if [[ ${MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE:-} ]]; then + args+=(--allowed-version-type "${MODRINTH_PROJECTS_DEFAULT_VERSION_TYPE:-}") + fi + if ! VERSION=$(mc-image-helper version-from-modrinth-projects "${args[@]}" --projects "${MODRINTH_PROJECTS}"); then logError "failed to resolve version from MODRINTH_PROJECTS: ${MODRINTH_PROJECTS}" exit 1 fi