From 92a15ea85d0323be169d665034081d0917783c03 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Mon, 15 Feb 2021 10:21:18 -0600
Subject: [PATCH] Updated forge examples to use java8 image #770

---
 README.md                                 |  6 ++----
 examples/docker-compose-curseforge.yml    |  2 +-
 examples/docker-compose-curseinstance.yml | 20 --------------------
 examples/docker-compose-forge.yml         |  2 +-
 examples/docker-compose-ftba.yml          |  4 ++--
 examples/docker-compose-spongeforge.yml   |  2 +-
 6 files changed, 7 insertions(+), 29 deletions(-)
 delete mode 100644 examples/docker-compose-curseinstance.yml

diff --git a/README.md b/README.md
index 76acf19f..8a94d9fb 100644
--- a/README.md
+++ b/README.md
@@ -729,16 +729,14 @@ every time you want to create new Minecraft server, you can now use
 
 ```
 minecraft-server:
+  image: itzg/minecraft-server
+
   ports:
     - "25565:25565"
 
   environment:
     EULA: "TRUE"
 
-  image: itzg/minecraft-server
-
-  container_name: mc
-
   tty: true
   stdin_open: true
   restart: always
diff --git a/examples/docker-compose-curseforge.yml b/examples/docker-compose-curseforge.yml
index fbdd8c89..50c748c4 100644
--- a/examples/docker-compose-curseforge.yml
+++ b/examples/docker-compose-curseforge.yml
@@ -2,7 +2,7 @@ version: '3.2'
 
 services:
   mc:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java8
     volumes:
     - ./modpacks:/modpacks:ro
     environment:
diff --git a/examples/docker-compose-curseinstance.yml b/examples/docker-compose-curseinstance.yml
deleted file mode 100644
index c1d62f7f..00000000
--- a/examples/docker-compose-curseinstance.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: "3.7"
-
-services:
-  mc:
-    image: itzg/minecraft-server
-    ports:
-      - 25565:25565
-    volumes:
-      # Attach .../Curse/Minecraft/Instances for use at /instances
-      - ./Instances:/instances:ro
-      # Attach /data as usual
-      - ./ServerData:/data
-    environment:
-      EULA: "TRUE"
-      # Modpacks generally need more memory, so let's give at 2 GB
-      MEMORY: 2G
-      # Use new CURSE_INSTANCE type
-      TYPE: CURSE_INSTANCE
-      # Reference directory of or full path to minecraftinstance.json
-      CURSE_INSTANCE_JSON: /instances/FTB Presents SkyFactory 3
diff --git a/examples/docker-compose-forge.yml b/examples/docker-compose-forge.yml
index 4c9f6c86..2e2a5d59 100644
--- a/examples/docker-compose-forge.yml
+++ b/examples/docker-compose-forge.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   mc:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java8
     ports:
     # expose the Minecraft server port outside of container
     - 25565:25565
diff --git a/examples/docker-compose-ftba.yml b/examples/docker-compose-ftba.yml
index 6e07bbbc..81019b59 100644
--- a/examples/docker-compose-ftba.yml
+++ b/examples/docker-compose-ftba.yml
@@ -2,8 +2,8 @@ version: "3.7"
 
 services:
   mc:
-    # FTBA support is only available in multiarch image tag
-    image: itzg/minecraft-server:multiarch
+    # FTBA support is only available in non-Alpine images
+    image: itzg/minecraft-server:java8-multiarch
     ports:
       # expose the Minecraft server port outside of container
       - 25565:25565
diff --git a/examples/docker-compose-spongeforge.yml b/examples/docker-compose-spongeforge.yml
index 6843b64c..e8b6ae39 100644
--- a/examples/docker-compose-spongeforge.yml
+++ b/examples/docker-compose-spongeforge.yml
@@ -5,7 +5,7 @@ version: '3'
 
 services:
   minecraft:
-    image: itzg/minecraft-server
+    image: itzg/minecraft-server:java8
     ports:
       - "25565:25565"
     volumes: