From 2e8f27a8ef6520d1d54b7b926746b22cb50b46ea Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 23 Oct 2021 09:40:36 -0500
Subject: [PATCH] Allowed FTB_MODPACK_VERSION_ID to be an empty value #1081

---
 examples/docker-compose-ftba.yml | 7 ++++---
 scripts/start-deployFTBA         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/examples/docker-compose-ftba.yml b/examples/docker-compose-ftba.yml
index 4976296d..5bf4d14b 100644
--- a/examples/docker-compose-ftba.yml
+++ b/examples/docker-compose-ftba.yml
@@ -3,7 +3,7 @@ version: "3.8"
 services:
   mc:
     # FTBA support is only available in non-Alpine images
-    image: itzg/minecraft-server:java8-multiarch
+    image: itzg/minecraft-server:${IMAGE_TAG:-java8-multiarch}
     ports:
       # expose the Minecraft server port outside of container
       - 25565:25565
@@ -14,10 +14,11 @@ services:
       TYPE: FTBA
       # Use Pack ID from https://ftb.neptunepowered.org/pack/ftb-presents-direwolf20-1-12/
       FTB_MODPACK_ID: "31"
+      FTB_MODPACK_VERSION_ID: ""
     volumes:
       # use a named, managed volume for data volume
-      - mc_ftb:/data
+      - ftba:/data
 
 volumes:
   # declared the named volume, but use default/local storage engine
-  mc_ftb: {}
+  ftba: {}
diff --git a/scripts/start-deployFTBA b/scripts/start-deployFTBA
index f3eeaca4..5c6f5c49 100755
--- a/scripts/start-deployFTBA
+++ b/scripts/start-deployFTBA
@@ -16,7 +16,7 @@ if ! [[ ${FTB_MODPACK_ID} =~ [0-9]+ ]]; then
   exit 1
 fi
 
-if ! [[ -v FTB_MODPACK_VERSION_ID ]]; then
+if [[ ! $FTB_MODPACK_VERSION_ID ]]; then
   if ! FTB_MODPACK_VERSION_ID=$(curl -fsSL https://api.modpacks.ch/public/modpack/${FTB_MODPACK_ID} | jq -r '.versions | sort_by(.updated)[-1].id'); then
     log "ERROR unable to resolve latest modpack version ID for modpack ${FTB_MODPACK_ID}"
     exit 1