From 8712a7692b31d5416146a9d10ae08a979f9967f4 Mon Sep 17 00:00:00 2001
From: Vilhelm Prytz <vilhelm@prytznet.se>
Date: Wed, 16 Dec 2020 18:12:34 +0100
Subject: [PATCH 1/3] Add Minecraft Spigot

---
 images/minecraft/minecraft-spigot.json | 63 ++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 images/minecraft/minecraft-spigot.json

diff --git a/images/minecraft/minecraft-spigot.json b/images/minecraft/minecraft-spigot.json
new file mode 100644
index 0000000..b4dcdba
--- /dev/null
+++ b/images/minecraft/minecraft-spigot.json
@@ -0,0 +1,63 @@
+{
+  "meta": {
+    "api_version": 2
+  },
+  "uid": "minecraft-spigot",
+  "name": "Minecraft Spigot",
+  "author": "vilhelm@prytznet.se",
+  "docker_image": "wilfreddev/java:latest",
+  "command": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar server.jar",
+  "user": "container",
+  "stop_command": "stop",
+  "default_image": true,
+  "config": {
+    "files": [
+      {
+        "filename": "server.properties",
+        "parser": "properties",
+        "environment": [
+          {
+            "config_variable": "server-port",
+            "environment_variable": "SERVER_PORT",
+            "value_format": null
+          }
+        ],
+        "action": {
+          "difficulty": "difficulty {}",
+          "white-list": "whitelist {}"
+        }
+      }
+    ]
+  },
+  "installation": {
+    "docker_image": "wilfreddev/alpine:latest",
+    "shell": "/bin/ash",
+    "script": [
+      "apk --no-cache --update add curl jq",
+      "curl -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar",
+      "java -jar BuildTools.jar --rev $MINECRAFT_VERSION",
+      "if [ \"$EULA_ACCEPTANCE\" == \"true\" ]; then",
+      "   echo \"eula=true\" > eula.txt",
+      "fi",
+      "curl -o server.properties https://raw.githubusercontent.com/wilfred-dev/images/master/configs/minecraft/standard/server.properties",
+      "sed -i \"s/{{SERVER_PORT}}/$SERVER_PORT/g\" server.properties",
+      "chown -R container:container /server"
+    ]
+  },
+  "variables": [
+    {
+      "prompt": "Which Minecraft version to use during install (has to be supported by SPigot)?",
+      "variable": "MINECRAFT_VERSION",
+      "install_only": true,
+      "default": "latest",
+      "hidden": false
+    },
+    {
+      "prompt": "Do you agree to the Minecraft EULA (https://account.mojang.com/documents/minecraft_eula)?",
+      "variable": "EULA_ACCEPTANCE",
+      "install_only": true,
+      "default": "true",
+      "hidden": false
+    }
+  ]
+}

From fde3d4a6253c4bb73a2fd9afb64607cdcee47d85 Mon Sep 17 00:00:00 2001
From: Vilhelm Prytz <vilhelm@prytznet.se>
Date: Thu, 17 Dec 2020 12:51:26 +0100
Subject: [PATCH 2/3] Minecraft Spigot: change docker image during install and
 add missing git

---
 images/minecraft/minecraft-spigot.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/minecraft/minecraft-spigot.json b/images/minecraft/minecraft-spigot.json
index b4dcdba..46022fc 100644
--- a/images/minecraft/minecraft-spigot.json
+++ b/images/minecraft/minecraft-spigot.json
@@ -30,10 +30,10 @@
     ]
   },
   "installation": {
-    "docker_image": "wilfreddev/alpine:latest",
+    "docker_image": "wilfreddev/java:latest",
     "shell": "/bin/ash",
     "script": [
-      "apk --no-cache --update add curl jq",
+      "apk --no-cache --update add curl jq git",
       "curl -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar",
       "java -jar BuildTools.jar --rev $MINECRAFT_VERSION",
       "if [ \"$EULA_ACCEPTANCE\" == \"true\" ]; then",
@@ -46,7 +46,7 @@
   },
   "variables": [
     {
-      "prompt": "Which Minecraft version to use during install (has to be supported by SPigot)?",
+      "prompt": "Which Minecraft version to use during install (has to be supported by Spigot)?",
       "variable": "MINECRAFT_VERSION",
       "install_only": true,
       "default": "latest",

From 086d65885b17d6788d9f53a866567cdaa897a728 Mon Sep 17 00:00:00 2001
From: Vilhelm Prytz <vilhelm@prytznet.se>
Date: Thu, 17 Dec 2020 12:57:25 +0100
Subject: [PATCH 3/3] Minecraft Spigot: run BuildTools in temp dir

---
 images/minecraft/minecraft-spigot.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/images/minecraft/minecraft-spigot.json b/images/minecraft/minecraft-spigot.json
index 46022fc..8ed0380 100644
--- a/images/minecraft/minecraft-spigot.json
+++ b/images/minecraft/minecraft-spigot.json
@@ -34,8 +34,12 @@
     "shell": "/bin/ash",
     "script": [
       "apk --no-cache --update add curl jq git",
+      "mkdir build && cd build",
       "curl -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar",
       "java -jar BuildTools.jar --rev $MINECRAFT_VERSION",
+      "mv spigot-*.jar ../server.jar",
+      "cd ..",
+      "rm -rf build",
       "if [ \"$EULA_ACCEPTANCE\" == \"true\" ]; then",
       "   echo \"eula=true\" > eula.txt",
       "fi",