From b927c49968ae8669da34691f53940a65ef4ad85e Mon Sep 17 00:00:00 2001
From: BrokenFire <seb6596@gmail.com>
Date: Wed, 13 Dec 2017 00:29:41 +0100
Subject: [PATCH 01/13] Change to production log patern

---
 src/main/resources/log4j2.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 1186464..e493af1 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -2,7 +2,8 @@
 <Configuration status="error">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="[%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />
+            <!--<PatternLayout pattern="[%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />-->
+            <PatternLayout pattern="[%-5level][%-30.30c{1.}]: %msg%n" />
         </Console>
         <!--<RollingFile name="RollingFile" fileName="/logs/curent.log"
                      filePattern="/logs/$${date:yyyy-MM}/discordBot-%d{yyyy-MM-dd-HH}-%i.log.gz">

From 8cfc7e37ad2c0136d05e2caf54e0828bc7092d76 Mon Sep 17 00:00:00 2001
From: BrokenFire <seb6596@gmail.com>
Date: Wed, 13 Dec 2017 00:31:57 +0100
Subject: [PATCH 02/13] LogFile

---
 src/main/resources/log4j2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index e493af1..30fdbda 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -20,7 +20,7 @@
     <Loggers>
         <Root level="debug">
             <AppenderRef ref="Console" level="info"/>
-            <AppenderRef ref="RollingFile" level="info"/>
+            <!--<AppenderRef ref="RollingFile" level="info"/>-->
         </Root>
     </Loggers>
 </Configuration>

From 3184e9cb02bde4ebe72c98e9768d0dfa35134076 Mon Sep 17 00:00:00 2001
From: BrokenFire <seb6596@gmail.com>
Date: Wed, 13 Dec 2017 00:33:56 +0100
Subject: [PATCH 03/13] Stupid mistake...

---
 Procfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Procfile b/Procfile
index 5949ebc..e3b7ecc 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: java -Dlog4j.configurationFile=/app/Heroku/log4j2.xml -jar /app/build/libs/DiscordBot-0.1.0.jar -t $TOKEN
+web: java -jar /app/build/libs/DiscordBot-0.1.0.jar -t $TOKEN

From 03d13785517d9c1a45548426ac45d0394c5103ab Mon Sep 17 00:00:00 2001
From: BrokenFire <seb6596@gmail.com>
Date: Wed, 13 Dec 2017 00:47:15 +0100
Subject: [PATCH 04/13] testing logs

---
 src/main/resources/log4j2.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 30fdbda..ed56d78 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -2,8 +2,8 @@
 <Configuration status="error">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
-            <!--<PatternLayout pattern="[%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />-->
-            <PatternLayout pattern="[%-5level][%-30.30c{1.}]: %msg%n" />
+            <PatternLayout pattern="[%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />
+            <!--<PatternLayout pattern="[%-5level][%-30.30c{1.}]: %msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />-->
         </Console>
         <!--<RollingFile name="RollingFile" fileName="/logs/curent.log"
                      filePattern="/logs/$${date:yyyy-MM}/discordBot-%d{yyyy-MM-dd-HH}-%i.log.gz">

From 1630371d5a984f7a463245a4c844f117524c4c10 Mon Sep 17 00:00:00 2001
From: BrokenFire <seb6596@gmail.com>
Date: Wed, 13 Dec 2017 00:50:57 +0100
Subject: [PATCH 05/13] samme

---
 src/main/resources/log4j2.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index ed56d78..7af9a21 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -2,7 +2,7 @@
 <Configuration status="error">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="[%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />
+            <PatternLayout pattern="[%d{HH:mm:ss.SSS}][%-5level][%-30.30c{1.}]: %msg%n" />
             <!--<PatternLayout pattern="[%-5level][%-30.30c{1.}]: %msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />-->
         </Console>
         <!--<RollingFile name="RollingFile" fileName="/logs/curent.log"

From 78f9f64cd13dc2b04a10bc9541722f47fd8e5be9 Mon Sep 17 00:00:00 2001
From: BrokenFire <seb6596@gmail.com>
Date: Wed, 13 Dec 2017 10:05:43 +0100
Subject: [PATCH 06/13] Try to debug logs

---
 src/main/resources/log4j2.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 7af9a21..aac6c58 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -2,7 +2,8 @@
 <Configuration status="error">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="[%d{HH:mm:ss.SSS}][%-5level][%-30.30c{1.}]: %msg%n" />
+            <PatternLayout pattern="[%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />
+            <!--<PatternLayout pattern="[%d{HH:mm:ss.SSS}][%-5level][%-30.30c{1.}]: %msg%n" />-->
             <!--<PatternLayout pattern="[%-5level][%-30.30c{1.}]: %msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />-->
         </Console>
         <!--<RollingFile name="RollingFile" fileName="/logs/curent.log"

From e2902b101c73bd76966a8b00b8ab72b5d81b0d88 Mon Sep 17 00:00:00 2001
From: BrokenFire <seb6596@gmail.com>
Date: Wed, 13 Dec 2017 10:16:46 +0100
Subject: [PATCH 07/13] Heroku bug ?

---
 src/main/resources/log4j2.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index aac6c58..7f94c0d 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -2,9 +2,8 @@
 <Configuration status="error">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="[%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />
-            <!--<PatternLayout pattern="[%d{HH:mm:ss.SSS}][%-5level][%-30.30c{1.}]: %msg%n" />-->
-            <!--<PatternLayout pattern="[%-5level][%-30.30c{1.}]: %msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />-->
+            <!--<PatternLayout pattern="[%d{HH:mm:ss.SSS}]%highlight{[%-5level]}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}[%-30.30c{1.}]: %highlight{%msg%n}{FATAL=red blink, ERROR=red, WARN=bright yellow , INFO=blue, DEBUG=bright black, TRACE=cyan}" />-->
+            <PatternLayout pattern="[%d{HH:mm:ss.SSS}][%-5level][%-30.30c{1.}]: %msg%n" />
         </Console>
         <!--<RollingFile name="RollingFile" fileName="/logs/curent.log"
                      filePattern="/logs/$${date:yyyy-MM}/discordBot-%d{yyyy-MM-dd-HH}-%i.log.gz">

From 34cb2ce0f71d3ff7bb1a3118cbb7fff78b53f2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= <seb6596@gmail.com>
Date: Wed, 20 Dec 2017 17:21:18 +0100
Subject: [PATCH 08/13] Adding Docker support

---
 Dockerfile         | 10 ++++++++++
 docker-compose.yml | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 docker-compose.yml

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..5e6cf4e
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3
+ENV PYTHONUNBUFFERED 1
+#RUN apt-get update \
+#    && apt-get install -y python-mysqldb
+
+RUN mkdir /code
+WORKDIR /code
+ADD src/requirements.txt /code/
+RUN pip install -r requirements.txt
+ADD . /code/
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..7322633
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,26 @@
+version: '3'
+
+services:
+  web:
+    build: .
+    command: python3 manage.py runserver 0.0.0.0:8000
+    volumes:
+      - ./src:/code
+    ports:
+      - "8000:8000"
+    depends_on:
+      - database
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin:latest
+    ports:
+      - "8001:80"
+    depends_on:
+      - database
+    env_file:
+      - pma.env
+  database:
+    image: mariadb:latest
+    volumes:
+      - ./db:/var/lib/mysql
+    env_file:
+      - database.env

From 2384f93cd0a9ed2b1d07042cc9492d6255c147d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= <seb6596@gmail.com>
Date: Wed, 20 Dec 2017 17:27:05 +0100
Subject: [PATCH 09/13] Correct wrong files...

---
 Dockerfile         | 21 +++++++++++----------
 docker-compose.yml | 44 ++++++++++++++++++++------------------------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5e6cf4e..391a633 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,11 @@
-FROM python:3
-ENV PYTHONUNBUFFERED 1
-#RUN apt-get update \
-#    && apt-get install -y python-mysqldb
-
-RUN mkdir /code
-WORKDIR /code
-ADD src/requirements.txt /code/
-RUN pip install -r requirements.txt
-ADD . /code/
+FROM debian:latest
+RUN apt-get update
+RUN apt-get -y upgrade
+RUN apt-get -y install openjdk-8-jre openjdk-8-jdk
+WORKDIR /bot_src
+ADD . /bot_src/
+RUN chmod +x gradlew
+ENV PORT=8080
+ENV TOKEN=10
+RUN ./gradlew build
+CMD java -jar build/libs/DiscordBot-0.1.0.jar -t ${TOKEN}
diff --git a/docker-compose.yml b/docker-compose.yml
index 7322633..5f76d46 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,26 +1,22 @@
-version: '3'
+version: '2'
 
 services:
-  web:
-    build: .
-    command: python3 manage.py runserver 0.0.0.0:8000
-    volumes:
-      - ./src:/code
-    ports:
-      - "8000:8000"
-    depends_on:
-      - database
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin:latest
-    ports:
-      - "8001:80"
-    depends_on:
-      - database
-    env_file:
-      - pma.env
-  database:
-    image: mariadb:latest
-    volumes:
-      - ./db:/var/lib/mysql
-    env_file:
-      - database.env
+  botdiscord:
+    build: . 
+    networks:
+      - proxy
+    environment:
+      - PORT=8081
+      - TOKEN=1111111111111 #CHANGE ME!
+    labels:
+      - "traefik.frontend.rule=Host:discord.seb6596.ovh"
+      - "traefik.port=8080"
+      - "traefik.backend=botdiscord"
+      - "traefik.frontend.entryPoints=http,https"
+    #volumes:
+    #    - "/var/run/docker.sock:/var/run/docker.sock"
+    restart: always
+
+networks:
+    proxy:
+       external: true 

From 824498ec84fdb85009ccd37690e34c0d2f75819f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= <seb6596@gmail.com>
Date: Wed, 20 Dec 2017 17:40:43 +0100
Subject: [PATCH 10/13] Delete docker-compose.yml

---
 docker-compose.yml | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 5f76d46..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-version: '2'
-
-services:
-  botdiscord:
-    build: . 
-    networks:
-      - proxy
-    environment:
-      - PORT=8081
-      - TOKEN=1111111111111 #CHANGE ME!
-    labels:
-      - "traefik.frontend.rule=Host:discord.seb6596.ovh"
-      - "traefik.port=8080"
-      - "traefik.backend=botdiscord"
-      - "traefik.frontend.entryPoints=http,https"
-    #volumes:
-    #    - "/var/run/docker.sock:/var/run/docker.sock"
-    restart: always
-
-networks:
-    proxy:
-       external: true 

From 0954998a57fff0ac00cbd22184ef3d2e9cabbbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= <seb6596@gmail.com>
Date: Wed, 20 Dec 2017 17:54:44 +0100
Subject: [PATCH 11/13] Update README.md

---
 README.md | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 522e332..b0aa2fd 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,32 @@
-# Discord_Stroumpf_Beta
\ No newline at end of file
+# Discord_Stroumpf_Beta
+
+## Install:
+
+> The easiest method it's to use docker-compose:
+> 
+> docker-compose.yml:
+> ```YAML
+> version: '2'
+> 
+> services:
+>   botdiscord:
+>     image: brokenfire/discord_stroumpf_beta 
+>     networks:
+>       - proxy
+>     environment:
+>       - PORT=8081
+>       - TOKEN=1111111111111 #CHANGE ME!
+>     labels:
+>       - "traefik.frontend.rule=Host:exemple.com" #CHANGE ME!
+>       - "traefik.port=8080"
+>       - "traefik.backend=botdiscord"
+>       - "traefik.frontend.entryPoints=http,https"
+>     #volumes:
+>     #    - "/var/run/docker.sock:/var/run/docker.sock"
+>     restart: always
+> 
+> networks:
+>     proxy:
+>        external: true 
+> ```
+> Docker hub [repo](https://hub.docker.com/r/brokenfire/discord_stroumpf_beta/)

From c207ee2a89bf4ef33ec373b5f436e3b4b78f1e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= <seb6596@gmail.com>
Date: Wed, 20 Dec 2017 17:58:08 +0100
Subject: [PATCH 12/13] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b0aa2fd..96321d9 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Discord_Stroumpf_Beta
+# BrokenDiscordBot
 
 ## Install:
 

From 7e1a26afc7a154bfbb84e54d505760be45684738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= <seb6596@gmail.com>
Date: Wed, 20 Dec 2017 18:03:16 +0100
Subject: [PATCH 13/13] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 96321d9..6e2c3bf 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 > 
 > services:
 >   botdiscord:
->     image: brokenfire/discord_stroumpf_beta 
+>     image: brokenfire/brokendiscordbot 
 >     networks:
 >       - proxy
 >     environment:
@@ -29,4 +29,4 @@
 >     proxy:
 >        external: true 
 > ```
-> Docker hub [repo](https://hub.docker.com/r/brokenfire/discord_stroumpf_beta/)
+> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)