Merge remote-tracking branch 'origin/master' into devel
This commit is contained in:
commit
4e0909038d
11
Dockerfile
Normal file
11
Dockerfile
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
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}
|
2
Procfile
2
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
|
||||||
|
33
README.md
33
README.md
@ -1 +1,32 @@
|
|||||||
# Discord_Stroumpf_Beta
|
# BrokenDiscordBot
|
||||||
|
|
||||||
|
## Install:
|
||||||
|
|
||||||
|
> The easiest method it's to use docker-compose:
|
||||||
|
>
|
||||||
|
> docker-compose.yml:
|
||||||
|
> ```YAML
|
||||||
|
> version: '2'
|
||||||
|
>
|
||||||
|
> services:
|
||||||
|
> botdiscord:
|
||||||
|
> image: brokenfire/brokendiscordbot
|
||||||
|
> 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/brokendiscordbot/)
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
<Configuration status="error">
|
<Configuration status="error">
|
||||||
<Appenders>
|
<Appenders>
|
||||||
<Console name="Console" target="SYSTEM_OUT">
|
<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="[%d{HH:mm:ss.SSS}][%-5level][%-30.30c{1.}]: %msg%n" />
|
||||||
</Console>
|
</Console>
|
||||||
<!--<RollingFile name="RollingFile" fileName="/logs/curent.log"
|
<!--<RollingFile name="RollingFile" fileName="/logs/curent.log"
|
||||||
filePattern="/logs/$${date:yyyy-MM}/discordBot-%d{yyyy-MM-dd-HH}-%i.log.gz">
|
filePattern="/logs/$${date:yyyy-MM}/discordBot-%d{yyyy-MM-dd-HH}-%i.log.gz">
|
||||||
@ -19,7 +20,7 @@
|
|||||||
<Loggers>
|
<Loggers>
|
||||||
<Root level="debug">
|
<Root level="debug">
|
||||||
<AppenderRef ref="Console" level="info"/>
|
<AppenderRef ref="Console" level="info"/>
|
||||||
<AppenderRef ref="RollingFile" level="info"/>
|
<!--<AppenderRef ref="RollingFile" level="info"/>-->
|
||||||
</Root>
|
</Root>
|
||||||
</Loggers>
|
</Loggers>
|
||||||
</Configuration>
|
</Configuration>
|
||||||
|
Loading…
Reference in New Issue
Block a user