From c458823014381366a4798160c35594f0ad6b2504 Mon Sep 17 00:00:00 2001 From: Andrew Lambeth Date: Sat, 26 Dec 2020 12:44:37 -0800 Subject: [PATCH 1/2] ignore duplicate entries in the targets array of version.json (#698) --- start-deployFTBA | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start-deployFTBA b/start-deployFTBA index e96b81dc..19800f9a 100644 --- a/start-deployFTBA +++ b/start-deployFTBA @@ -48,8 +48,8 @@ else fi isDebugging && cat version.json -forgeVersion=$(jq -r '.targets[] | select(.name == "forge") | .version' version.json) -mcVersion=$(jq -r '.targets[] | select(.name == "minecraft") | .version' version.json) +forgeVersion=$(jq -r '.targets|unique[] | select(.name == "forge") | .version' version.json) +mcVersion=$(jq -r '.targets|unique[] | select(.name == "minecraft") | .version' version.json) variants=( forge-${mcVersion}-${forgeVersion}.jar From 51e6d5dfbd659d9f0bdd0f4fcebb5879b4f4c6fc Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Mon, 28 Dec 2020 11:42:54 -0600 Subject: [PATCH 2/2] Added install of sudo For #699 --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6b59ce61..b049e493 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ RUN apt-get update \ openjdk-8-jre-headless \ imagemagick \ gosu \ + sudo \ curl wget \ jq \ dos2unix \