amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-05-23 04:05:26 +00:00
Code Issues Projects Releases Wiki Activity

Restore FORGE_INSTALLER (again) using mc-image-helper (#1880)

Browse Source
This commit is contained in:
Geoff Bourne
2023-01-01 09:12:39 -06:00
committed by GitHub
parent c9341ec125
commit 7be36cc2cf
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/start-deployForge
+23 -8
View File
@@ -7,16 +7,31 @@
. "${SCRIPTS:-$(dirname "$0")}/start-utils" . "${SCRIPTS:-$(dirname "$0")}/start-utils"
isDebugging && set -x isDebugging && set -x
if ! mc-image-helper install-forge \ if [[ ${FORGE_INSTALLER} ]]; then
--output-directory=/data \ if ! mc-image-helper install-forge \
--results-file=/data/.run-forge.env \ --output-directory=/data \
--minecraft-version="${VANILLA_VERSION}" \ --results-file=/data/.run-forge.env \
--forge-version="${FORGE_VERSION}" \ --minecraft-version="${VANILLA_VERSION}" \
--force-reinstall="${FORGE_FORCE_REINSTALL}"; then --forge-installer="${FORGE_INSTALLER}" \
log "ERROR failed to install forge" --force-reinstall="${FORGE_FORCE_REINSTALL}"; then
exit 1 log "ERROR failed to install Forge given installer ${FORGE_INSTALLER}"
exit 1
fi
else
if ! mc-image-helper install-forge \
--output-directory=/data \
--results-file=/data/.run-forge.env \
--minecraft-version="${VANILLA_VERSION}" \
--forge-version="${FORGE_VERSION}" \
--force-reinstall="${FORGE_FORCE_REINSTALL}"; then
log "ERROR failed to install Forge"
exit 1
fi
fi fi
# grab SERVER and export it # grab SERVER and export it
set -a set -a
source /data/.run-forge.env source /data/.run-forge.env