From 7132b36472bf6f9f0b1d3e1d7ab00a14ea76bf00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= <seb6596@gmail.com>
Date: Thu, 15 Feb 2018 21:59:50 +0100
Subject: [PATCH 1/5] Remove max mem

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

diff --git a/Dockerfile b/Dockerfile
index 78dedc9..8e99f41 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,4 +9,4 @@ RUN chmod +x gradlew
 ENV PORT=8080
 ENV TOKEN=10
 RUN ./gradlew build
-CMD java -Xmx500m -jar build/libs/DiscordBot-0.1.0.jar -t ${TOKEN}
+CMD java -jar build/libs/DiscordBot-0.1.0.jar -t ${TOKEN}

From 04fe7b55884763acd1d7af22bb0fee253158f980 Mon Sep 17 00:00:00 2001
From: Unknown <seb6596@gmail.com>
Date: Thu, 15 Feb 2018 23:08:12 +0100
Subject: [PATCH 2/5] Update docker-compose

---
 README.md | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 3cb6697..59b153d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # BrokenDiscordBot
-
+ 
 ## Install:
-
+ 
 > The easiest method it's to use docker-compose:
 > 
 > docker-compose.yml:
@@ -10,24 +10,38 @@
 > 
 > services:
 >   botdiscord:
->     image: brokenfire/brokendiscordbot:latest  
+>     image: brokenfire/brokendiscordbot:latest
 >     networks:
 >       - proxy
+>       - internal
 >     environment:
->       - PORT=8081
+>       - PORT=8080
 >       - TOKEN=1111111111111 #CHANGE ME!
+>       - DB_URL=jdbc:mysql://database/botdiscord 
+>       - DB_USER=root 
+>       - DB_PWD=ogahxu1eigohN2Eok0xoawae #CHANGE ME!
 >     labels:
 >       - "traefik.frontend.rule=Host:exemple.com" #CHANGE ME!
+>       - "traefik.docker.network=proxy"
 >       - "traefik.port=8080"
 >       - "traefik.backend=botdiscord"
 >       - "traefik.frontend.entryPoints=http,https"
->     volumes:                                                                              
->        - "./logs:/bot_src/logs"
+>     volumes:
+>       - "./logs:/bot_src/logs"
+>     depends_on:
+>       - "database"
 >     restart: always
 > 
-> networks:
->     proxy:
->        external: true 
-> ```
-> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)
-                                                      
+>   phpmyadmin:
+>     image: phpmyadmin/phpmyadmin:latest
+>     labels:
+>       - "traefik.frontend.rule=Host:phpmyadmin.exemple.com" #CHANGE ME!
+>       - "traefik.port=80"
+>       - "traefik.docker.network=proxy"
+>       - "traefik.backend=phpmyadmin"
+>       - "traefik.frontend.entryPoints=http,https"
+>     environment:
+>       - PMA_HOST=database
+>     depends_on:
+>       - "database"
+>     networks:
\ No newline at end of file

From eff8cbccf2497f823fe25836b22ace75796a13e0 Mon Sep 17 00:00:00 2001
From: Unknown <seb6596@gmail.com>
Date: Thu, 15 Feb 2018 23:11:43 +0100
Subject: [PATCH 3/5] Update docker-compose

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 59b153d..d00d358 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,22 @@
 >       - "traefik.docker.network=proxy"
 >       - "traefik.backend=phpmyadmin"
 >       - "traefik.frontend.entryPoints=http,https"
+>
+>   database:
+>     image: mariadb:latest
+>     volumes:
+>       - ./db:/var/lib/mysql
+>     labels:
+>       - "traefik.enable=false"
+>     environment:
+>       - MYSQL_ROOT_PASSWORD= #CHANGE ME!
+>       - MYSQL_DATABASE=botdiscord
+>       - MYSQL_USER=bot
+>       - MYSQL_PASSWORD=Ho0duiWo3noo3Ahrahx0rohz #CHANGE ME!
+>     networks:
+>       - internal
+>
+>
 >     environment:
 >       - PMA_HOST=database
 >     depends_on:

From bf3e1c948ec6de8604454d0e866d358669d6dc19 Mon Sep 17 00:00:00 2001
From: Unknown <seb6596@gmail.com>
Date: Thu, 15 Feb 2018 23:13:54 +0100
Subject: [PATCH 4/5] Update readme

---
 README.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d00d358..33ddcf5 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,10 @@
 >       - "traefik.docker.network=proxy"
 >       - "traefik.backend=phpmyadmin"
 >       - "traefik.frontend.entryPoints=http,https"
+>     environment:
+>       - PMA_HOST=database
+>     depends_on:
+>       - "database"
 >
 >   database:
 >     image: mariadb:latest
@@ -55,9 +59,8 @@
 >     networks:
 >       - internal
 >
->
->     environment:
->       - PMA_HOST=database
->     depends_on:
->       - "database"
->     networks:
\ No newline at end of file
+> networks:
+>     proxy:
+>       external: true
+>     internal:
+>       external: false
\ No newline at end of file

From ddcb8d18a9822cb6f7d4016340cc95ef674bd0f0 Mon Sep 17 00:00:00 2001
From: Unknown <seb6596@gmail.com>
Date: Thu, 15 Feb 2018 23:21:39 +0100
Subject: [PATCH 5/5] Update readme

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 33ddcf5..aa08c6f 100644
--- a/README.md
+++ b/README.md
@@ -63,4 +63,6 @@
 >     proxy:
 >       external: true
 >     internal:
->       external: false
\ No newline at end of file
+>       external: false
+> ```
+> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)
\ No newline at end of file