Correct wrong files...

This commit is contained in:
Sébastien Clément 2017-12-20 17:27:05 +01:00 committed by GitHub
parent 34cb2ce0f7
commit 2384f93cd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 34 deletions

View File

@ -1,10 +1,11 @@
FROM python:3 FROM debian:latest
ENV PYTHONUNBUFFERED 1 RUN apt-get update
#RUN apt-get update \ RUN apt-get -y upgrade
# && apt-get install -y python-mysqldb RUN apt-get -y install openjdk-8-jre openjdk-8-jdk
WORKDIR /bot_src
RUN mkdir /code ADD . /bot_src/
WORKDIR /code RUN chmod +x gradlew
ADD src/requirements.txt /code/ ENV PORT=8080
RUN pip install -r requirements.txt ENV TOKEN=10
ADD . /code/ RUN ./gradlew build
CMD java -jar build/libs/DiscordBot-0.1.0.jar -t ${TOKEN}

View File

@ -1,26 +1,22 @@
version: '3' version: '2'
services: services:
web: botdiscord:
build: . build: .
command: python3 manage.py runserver 0.0.0.0:8000 networks:
volumes: - proxy
- ./src:/code environment:
ports: - PORT=8081
- "8000:8000" - TOKEN=1111111111111 #CHANGE ME!
depends_on: labels:
- database - "traefik.frontend.rule=Host:discord.seb6596.ovh"
phpmyadmin: - "traefik.port=8080"
image: phpmyadmin/phpmyadmin:latest - "traefik.backend=botdiscord"
ports: - "traefik.frontend.entryPoints=http,https"
- "8001:80" #volumes:
depends_on: # - "/var/run/docker.sock:/var/run/docker.sock"
- database restart: always
env_file:
- pma.env networks:
database: proxy:
image: mariadb:latest external: true
volumes:
- ./db:/var/lib/mysql
env_file:
- database.env