From 388a4b4f07d0536356b50447961851efdbf6733e Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Thu, 18 Feb 2021 13:32:55 +0100
Subject: [PATCH] push to spigotmc 1.16.5

---
 Dockerfile                          | 20 +++++++++++++++-----
 rootfs/etc/services.d/minecraft/run |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e092615..ca4125b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,24 @@
-FROM alpine:3.12 as builder
+FROM alpine:3.13 as builder
 
 RUN apk --no-cache add \
-    openssl \
-    curl
+    openjdk8 \
+    git \
+    maven
 
-RUN curl -L -o /paper.jar https://papermc.io/api/v1/paper/1.16.2/159/download
+ENV BUILDTOOLS_VERSION=abd1c566d8cd758bac3a9d67543b719d4b9ab673
+RUN git clone https://hub.spigotmc.org/stash/scm/spigot/buildtools.git
+
+WORKDIR /buildtools
+RUN git checkout "$BUILDTOOLS_VERSION"
+RUN mvn package
+
+ENV SPIGOT_VERSION=1.16.5
+RUN java -jar target/BuildTools.jar --rev "$SPIGOT_VERSION"
+RUN mv spigot-$SPIGOT_VERSION.jar spigot.jar
 
 FROM thallian/confd-env:latest
 
-COPY --from=builder /paper.jar /var/lib/minecraft/paper.jar
+COPY --from=builder /buildtools/spigot.jar /var/lib/minecraft/spigot.jar
 
 RUN apk add --no-cache \
     openjdk8 \
diff --git a/rootfs/etc/services.d/minecraft/run b/rootfs/etc/services.d/minecraft/run
index f1e2bca..cb269e2 100755
--- a/rootfs/etc/services.d/minecraft/run
+++ b/rootfs/etc/services.d/minecraft/run
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv sh
 
 cd /var/lib/minecraft
-exec s6-setuidgid minecraft java -Xms${MIN_RAM:-512M} -Xmx${MAX_RAM:-512M} -XX:+UseG1GC -jar /var/lib/minecraft/paper.jar
+exec s6-setuidgid minecraft java -Xms${MIN_RAM:-512M} -Xmx${MAX_RAM:-512M} -XX:+UseG1GC -jar /var/lib/minecraft/spigot.jar