mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-10-05 20:10:29 +00:00
Install Neoforge from a local file (#3918)
Co-authored-by: Geoff Bourne <itzgeoff@gmail.com>
This commit is contained in:
co-authored by
Geoff Bourne
parent
6e05807865
commit
796849f9d8
+2
-1
@@ -49,7 +49,8 @@ RUN easy-add --var os=${TARGETOS} --var arch=${TARGETARCH}${TARGETVARIANT} \
|
|||||||
--var version=${MC_SERVER_RUNNER_VERSION} --var app=mc-server-runner --file {{.app}} \
|
--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
|
--from ${GITHUB_BASEURL}/itzg/{{.app}}/releases/download/{{.version}}/{{.app}}_{{.version}}_{{.os}}_{{.arch}}.tar.gz
|
||||||
|
|
||||||
ARG MC_HELPER_VERSION=1.53.4
|
|
||||||
|
ARG MC_HELPER_VERSION=1.54.0
|
||||||
ARG MC_HELPER_BASE_URL=${GITHUB_BASEURL}/itzg/mc-image-helper/releases/download/${MC_HELPER_VERSION}
|
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
|
# used for cache busting local copy of mc-image-helper
|
||||||
ARG MC_HELPER_REV=1
|
ARG MC_HELPER_REV=1
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
: "${NEOFORGE_VERSION:=latest}"
|
: "${NEOFORGE_VERSION:=latest}"
|
||||||
: "${NEOFORGE_FORCE_REINSTALL:=false}}"
|
: "${NEOFORGE_FORCE_REINSTALL:=false}}"
|
||||||
|
: "${NEOFORGE_INSTALLER:=}"
|
||||||
|
|
||||||
# shellcheck source=start-utils
|
# shellcheck source=start-utils
|
||||||
. "${SCRIPTS:-$(dirname "$0")}/start-utils"
|
. "${SCRIPTS:-$(dirname "$0")}/start-utils"
|
||||||
@@ -9,14 +10,19 @@ isDebugging && set -x
|
|||||||
|
|
||||||
resultsFile=/data/.run-neoforge.env
|
resultsFile=/data/.run-neoforge.env
|
||||||
|
|
||||||
if ! mc-image-helper install-neoforge \
|
if [[ ${NEOFORGE_INSTALLER} ]]; then
|
||||||
|
if ! mc-image-helper install-neoforge --neoforge-installer="${NEOFORGE_INSTALLER}" --output-directory=/data --results-file=${resultsFile} --minecraft-version="${VERSION}" --force-reinstall="${NEOFORGE_FORCE_REINSTALL}"; then
|
||||||
|
logError "Failed to installForge given installer ${NEOFORGE_INSTALLER}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
elif ! mc-image-helper install-neoforge \
|
||||||
--output-directory=/data \
|
--output-directory=/data \
|
||||||
--results-file=${resultsFile} \
|
--results-file=${resultsFile} \
|
||||||
--minecraft-version="${VERSION}" \
|
--minecraft-version="${VERSION}" \
|
||||||
--neoforge-version="${NEOFORGE_VERSION}" \
|
--neoforge-version="${NEOFORGE_VERSION}" \
|
||||||
--force-reinstall="${NEOFORGE_FORCE_REINSTALL}"; then
|
--force-reinstall="${NEOFORGE_FORCE_REINSTALL}"; then
|
||||||
logError "Failed to install NeoForge"
|
logError "Failed to install NeoForge"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
applyResultsFile ${resultsFile}
|
applyResultsFile ${resultsFile}
|
||||||
|
|||||||
Reference in New Issue
Block a user