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

Merge branch 'multiarch' into multiarch-latest

Browse Source
This commit is contained in:
Geoff Bourne
2020-12-28 11:44:41 -06:00
parent 3cc5cdbc06 51e6d5dfbd
commit de082d0fb2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1
View File
@@ -7,6 +7,7 @@ RUN apt-get update \
apt-get install -y \ apt-get install -y \
imagemagick \ imagemagick \
gosu \ gosu \
sudo \
curl wget \ curl wget \
jq \ jq \
dos2unix \ dos2unix \
start-deployFTBA
+2 -2
View File
@@ -48,8 +48,8 @@ else
fi fi
isDebugging && cat version.json isDebugging && cat version.json
forgeVersion=$(jq -r '.targets[] | select(.name == "forge") | .version' version.json) forgeVersion=$(jq -r '.targets|unique[] | select(.name == "forge") | .version' version.json)
mcVersion=$(jq -r '.targets[] | select(.name == "minecraft") | .version' version.json) mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json)
variants=( variants=(
forge-${mcVersion}-${forgeVersion}.jar forge-${mcVersion}-${forgeVersion}.jar