From 6da2aca97569757d93c4b4aa3b53b53aa483b538 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sun, 31 May 2020 18:39:53 -0500
Subject: [PATCH] Updated examples for FTBA support

---
 examples/docker-compose-curseforge.yml |  6 ++++--
 examples/docker-compose-forge.yml      | 14 +++++++-------
 examples/docker-compose-ftb.yml        | 16 ----------------
 examples/docker-compose-ftba.yml       | 23 +++++++++++++++++++++++
 examples/modpacks/.gitignore           |  1 +
 examples/modpacks/README.md            |  3 +++
 6 files changed, 38 insertions(+), 25 deletions(-)
 delete mode 100644 examples/docker-compose-ftb.yml
 create mode 100644 examples/docker-compose-ftba.yml
 create mode 100644 examples/modpacks/.gitignore
 create mode 100644 examples/modpacks/README.md

diff --git a/examples/docker-compose-curseforge.yml b/examples/docker-compose-curseforge.yml
index 8bdc844e..fbdd8c89 100644
--- a/examples/docker-compose-curseforge.yml
+++ b/examples/docker-compose-curseforge.yml
@@ -3,9 +3,11 @@ version: '3.2'
 services:
   mc:
     image: itzg/minecraft-server
+    volumes:
+    - ./modpacks:/modpacks:ro
     environment:
       EULA: "true"
-      TYPE: FTB
-      FTB_SERVER_MOD: https://minecraft.curseforge.com/projects/all-the-mods-expert-remastered/files/2493900/download
+      TYPE: CURSEFORGE
+      CF_SERVER_MOD: /modpacks/SkyFactory_4_Server_4.1.0.zip
     ports:
       - 25565:25565
diff --git a/examples/docker-compose-forge.yml b/examples/docker-compose-forge.yml
index 4c9f6c86..756d7d5b 100644
--- a/examples/docker-compose-forge.yml
+++ b/examples/docker-compose-forge.yml
@@ -2,7 +2,8 @@ version: "3.7"
 
 services:
   mc:
-    image: itzg/minecraft-server
+    # FTBA support is only available in multiarch image tag
+    image: itzg/minecraft-server:multiarch
     ports:
     # expose the Minecraft server port outside of container
     - 25565:25565
@@ -10,14 +11,13 @@ services:
       # REQUIRED for all types
       EULA: "TRUE"
       # Set server type (vs the default of vanilla)
-      TYPE: FORGE
+      TYPE: FTBA
+      # Use Pack ID from https://ftb.neptunepowered.org/pack/ftb-presents-direwolf20-1-12/
+      FTB_MODPACK_ID: "31"
     volumes:
     # use a named, managed volume for data volume
-    - mc_forge:/data
-    # attach local host directory "mods" in same directory as this compose file
-    # all mods in this directory get copied into /data/mods at startup
-    - ./mods:/mods:ro
+    - mc_ftb:/data
 
 volumes:
   # declared the named volume, but use default/local storage engine
-  mc_forge: {}
+  mc_ftb: {}
diff --git a/examples/docker-compose-ftb.yml b/examples/docker-compose-ftb.yml
deleted file mode 100644
index f6c49488..00000000
--- a/examples/docker-compose-ftb.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: '3.2'
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    environment:
-      EULA: "true"
-      TYPE: FTB
-      FTB_SERVER_MOD: https://www.feed-the-beast.com/projects/ftb-presents-skyfactory-3/files/2481284
-    ports:
-      - 25565:25565
-    volumes:
-      - mc-ftb:/data
-
-volumes:
-  mc-ftb:
\ No newline at end of file
diff --git a/examples/docker-compose-ftba.yml b/examples/docker-compose-ftba.yml
new file mode 100644
index 00000000..4c9f6c86
--- /dev/null
+++ b/examples/docker-compose-ftba.yml
@@ -0,0 +1,23 @@
+version: "3.7"
+
+services:
+  mc:
+    image: itzg/minecraft-server
+    ports:
+    # expose the Minecraft server port outside of container
+    - 25565:25565
+    environment:
+      # REQUIRED for all types
+      EULA: "TRUE"
+      # Set server type (vs the default of vanilla)
+      TYPE: FORGE
+    volumes:
+    # use a named, managed volume for data volume
+    - mc_forge:/data
+    # attach local host directory "mods" in same directory as this compose file
+    # all mods in this directory get copied into /data/mods at startup
+    - ./mods:/mods:ro
+
+volumes:
+  # declared the named volume, but use default/local storage engine
+  mc_forge: {}
diff --git a/examples/modpacks/.gitignore b/examples/modpacks/.gitignore
new file mode 100644
index 00000000..c4c4ffc6
--- /dev/null
+++ b/examples/modpacks/.gitignore
@@ -0,0 +1 @@
+*.zip
diff --git a/examples/modpacks/README.md b/examples/modpacks/README.md
new file mode 100644
index 00000000..17b8e85b
--- /dev/null
+++ b/examples/modpacks/README.md
@@ -0,0 +1,3 @@
+Please server [modpacks downloaded from CurseForge](https://www.curseforge.com/minecraft/modpacks) in this directory.
+
+The example [`docker-compose-curseforge.yml`](../docker-compose-curseforge.yml) references a modpack downloaded from <https://www.curseforge.com/minecraft/modpacks/skyfactory-4/files/2787018>.