From f4ab8147c6ee99547451f47aa276c9b52395195e Mon Sep 17 00:00:00 2001
From: adb <info@adb.sh>
Date: Sat, 30 Jan 2021 21:35:58 +0100
Subject: [PATCH] add docker-compose and Dockerfile

---
 Dockerfile                                            |  5 +++++
 build.gradle                                          |  2 ++
 docker-compose.yml                                    | 11 +++++++++++
 docker/docker-compose.yml                             |  8 ++++++++
 .../sh/adb/RandomRedditMemesAPI/CommunityHandler.java |  6 +++---
 5 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml
 create mode 100644 docker/docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c1b824b
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,5 @@
+FROM gradle:6.8.1-jdk8
+COPY . /home/gradle/project
+WORKDIR /home/gradle/project
+RUN gradle build
+CMD ["java -jar ./build/libs/RandomRedditMemesAPI.jar"]
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a2eb8bf..c47e232 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,6 +29,8 @@ dependencies {
     compile group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.0'
     compile group: 'javax.xml.bind', name : 'jaxb-api', version: '2.3.1'
     compile group: 'org.slf4j', name : 'nlog4j', version: '1.2.25'
+    compile group: 'org.slf4j', name : 'slf4j-api', version: '1.6.6'
+    compile group: 'org.slf4j', name : 'slf4j-simple', version: '1.6.6'
     testCompile group: 'commons-validator', name: 'commons-validator', version: '1.4.1'
     testCompile group: 'junit', name: 'junit', version: '4.8.1'
     testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.5'
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..aba6edd
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+version: '3'
+services:
+  api:
+    image: library/openjdk:8-alpine
+    volumes:
+      - ./:/home/gradle/project
+    working_dir: /home/gradle/project
+    command: sh -c 'java -jar ./build/libs/RandomRedditMemesAPI.jar'
+    ports:
+      - "8000:8000"
+    restart: always
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000..86e85ce
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,8 @@
+version: '3'
+services:
+  api:
+    build: ../
+    container_name: RandomRedditMemesAPI
+    ports:
+      - "8000:8000"
+    restart: always
\ No newline at end of file
diff --git a/src/main/java/sh/adb/RandomRedditMemesAPI/CommunityHandler.java b/src/main/java/sh/adb/RandomRedditMemesAPI/CommunityHandler.java
index c7f3194..04b5548 100644
--- a/src/main/java/sh/adb/RandomRedditMemesAPI/CommunityHandler.java
+++ b/src/main/java/sh/adb/RandomRedditMemesAPI/CommunityHandler.java
@@ -54,13 +54,13 @@ class CommunityHandler implements HttpHandler {
             subsJSON.put(subToJSON(
                 submissions.get(rand.nextInt(submissions.size()))
             ));
-            responseJSON.put("error", "false");
+            responseJSON.put("error", false);
             responseJSON.put("type", "random");
         } else if (pathArray[5].equals("all")) {
             submissions.forEach(sub -> {
                 subsJSON.put(subToJSON(sub));
             });
-            responseJSON.put("error", "false");
+            responseJSON.put("error", false);
             responseJSON.put("type", "all");
         } else {
             try{
@@ -68,7 +68,7 @@ class CommunityHandler implements HttpHandler {
                 if (subNum >= submissions.size()) responseJSON.put("error", "invalid input");
                 else{
                     subsJSON.put(subToJSON(submissions.get(subNum)));
-                    responseJSON.put("error", "false");
+                    responseJSON.put("error", false);
                     responseJSON.put("type", "specific");
                 }
             }catch (NumberFormatException ignored){