Merge remote-tracking branch 'origin/master' into devel

This commit is contained in:
BrokenFire 2018-02-16 14:18:46 +01:00
commit 3522e31481
2 changed files with 45 additions and 10 deletions

View File

@ -9,4 +9,4 @@ RUN chmod +x gradlew
ENV PORT=8080 ENV PORT=8080
ENV TOKEN=10 ENV TOKEN=10
RUN ./gradlew build 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}

View File

@ -1,7 +1,7 @@
# BrokenDiscordBot # BrokenDiscordBot
## Install: ## Install:
> The easiest method it's to use docker-compose: > The easiest method it's to use docker-compose:
> >
> docker-compose.yml: > docker-compose.yml:
@ -10,24 +10,59 @@
> >
> services: > services:
> botdiscord: > botdiscord:
> image: brokenfire/brokendiscordbot:latest > image: brokenfire/brokendiscordbot:latest
> networks: > networks:
> - proxy > - proxy
> - internal
> environment: > environment:
> - PORT=8081 > - PORT=8080
> - TOKEN=1111111111111 #CHANGE ME! > - TOKEN=1111111111111 #CHANGE ME!
> - DB_URL=jdbc:mysql://database/botdiscord
> - DB_USER=root
> - DB_PWD=ogahxu1eigohN2Eok0xoawae #CHANGE ME!
> labels: > labels:
> - "traefik.frontend.rule=Host:exemple.com" #CHANGE ME! > - "traefik.frontend.rule=Host:exemple.com" #CHANGE ME!
> - "traefik.docker.network=proxy"
> - "traefik.port=8080" > - "traefik.port=8080"
> - "traefik.backend=botdiscord" > - "traefik.backend=botdiscord"
> - "traefik.frontend.entryPoints=http,https" > - "traefik.frontend.entryPoints=http,https"
> volumes: > volumes:
> - "./logs:/bot_src/logs" > - "./logs:/bot_src/logs"
> depends_on:
> - "database"
> restart: always > restart: always
> >
> 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"
>
> 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
>
> networks: > networks:
> proxy: > proxy:
> external: true > external: true
> internal:
> external: false
> ``` > ```
> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) > Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/)