From 711d3eab1eca29682138a5bc1feacc75020f276f Mon Sep 17 00:00:00 2001
From: Daniel 'f0o' Preussker <f0o@devilcode.org>
Date: Mon, 23 Nov 2020 08:07:16 +0100
Subject: [PATCH 1/3] Add Docker support

---
 Dockerfile | 13 +++++++++++++
 entry.sh   |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 Dockerfile
 create mode 100755 entry.sh

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..565e49b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM maven:3-openjdk-16-slim AS maven
+
+COPY ./pom.xml ./pom.xml
+COPY ./src ./src
+
+RUN mvn package
+
+FROM openjdk:16-alpine
+
+COPY --from=maven target/InviteRoles-*-jar-with-dependencies.jar /java.jar
+COPY ./entry.sh /entry.sh
+
+CMD ["/entry.sh"]
diff --git a/entry.sh b/entry.sh
new file mode 100755
index 0000000..acddd73
--- /dev/null
+++ b/entry.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -jar /java.jar --token="${DISCORD_TOKEN}" --db="/database/db.sqlite"

From d725e00ee5d9ad216c0b953e510c251a515bc15d Mon Sep 17 00:00:00 2001
From: Daniel 'f0o' Preussker <f0o@devilcode.org>
Date: Mon, 23 Nov 2020 09:55:19 +0100
Subject: [PATCH 2/3] apply exit patch

---
 src/main/java/com/shimmermare/inviteroles/InviteRoles.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/shimmermare/inviteroles/InviteRoles.java b/src/main/java/com/shimmermare/inviteroles/InviteRoles.java
index e9fcd3f..6e2c906 100644
--- a/src/main/java/com/shimmermare/inviteroles/InviteRoles.java
+++ b/src/main/java/com/shimmermare/inviteroles/InviteRoles.java
@@ -110,7 +110,7 @@ private void run()
         catch (LoginException e)
         {
             LOGGER.error("Unable to login to Discord", e);
-            return;
+            System.exit(-1);
         }
 
         try
@@ -120,7 +120,7 @@ private void run()
         catch (InterruptedException e)
         {
             LOGGER.error("Failed to await JDA ready", e);
-            return;
+            System.exit(-1);
         }
 
         User selfUser = jda.getSelfUser();

From c6ab01528d224bf8ad9ad7e1406389d29837f5d2 Mon Sep 17 00:00:00 2001
From: Daniel 'f0o' Preussker <f0o@devilcode.org>
Date: Fri, 27 Nov 2020 14:58:59 +0100
Subject: [PATCH 3/3] Fix JDA

---
 pom.xml                                                    | 4 ++--
 src/main/java/com/shimmermare/inviteroles/InviteRoles.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b781037..ae414af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jdaVersion>4.0.0_47</jdaVersion>
+        <jdaVersion>4.2.0_168</jdaVersion>
         <brigadierVersion>1.0.17</brigadierVersion>
         <joptVersion>5.0.4</joptVersion>
         <logbackVersion>1.2.3</logbackVersion>
@@ -102,4 +102,4 @@
             </resource>
         </resources>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/com/shimmermare/inviteroles/InviteRoles.java b/src/main/java/com/shimmermare/inviteroles/InviteRoles.java
index 6e2c906..6f64591 100644
--- a/src/main/java/com/shimmermare/inviteroles/InviteRoles.java
+++ b/src/main/java/com/shimmermare/inviteroles/InviteRoles.java
@@ -99,7 +99,7 @@ private void run()
         commandDispatcher = new CommandDispatcher<>();
         Command.register(commandDispatcher);
 
-        JDABuilder jdaBuilder = new JDABuilder(token);
+        JDABuilder jdaBuilder = JDABuilder.createDefault(token);
 
         try
         {