diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..277e60f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +FROM python:3.8.10-slim + +# install dependencies for mysqlclient +# RUN apt-get update && apt-get -y upgrade && apt-get -y install python3-dev default-libmysqlclient-dev build-essential + +RUN pip install --upgrade pip + +WORKDIR /home + +COPY classes classes/ +COPY cogs cogs/ +COPY utilities utilities/ +COPY highscores.py highscores.py +COPY requirements.txt requirements.txt + +RUN pip install -r requirements.txt + +# remove build deps that aren't needed to run +# RUN apt-get -y remove python3-dev build-essential && apt-get -y autoremove + +CMD ["python3", "./highscores.py"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c884829..b6ee052 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: sqldb: restart: unless-stopped - build: docker/MySql + image: mysql:latest container_name: "Highscores-DataBase" volumes: - highscores_data:/var/lib/mysql @@ -12,9 +12,7 @@ services: bot: restart: unless-stopped - build: - context: ./ - dockerfile: ./docker/Highscores_Bot/Dockerfile + build: . container_name: "Highscores-Bot" depends_on: - sqldb diff --git a/docker/Highscores_Bot/Dockerfile b/docker/Highscores_Bot/Dockerfile deleted file mode 100644 index 29b5cca..0000000 --- a/docker/Highscores_Bot/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM python:3.8.10-alpine3.14 - -# need to install build dependencies -RUN apk add --no-cache --update python3 mariadb-connector-c-dev \ - && apk add --no-cache --update --virtual build-deps python3-dev g++ gfortran musl-dev \ - libffi-dev openssl-dev mariadb-dev - -# upgrade pip -RUN pip install --upgrade pip - -WORKDIR /home - -COPY classes classes/ -COPY cogs cogs/ -COPY utilities utilities/ -COPY highscores.py highscores.py -COPY requirements.txt requirements.txt - -RUN pip install -r requirements.txt - -RUN apk del build-deps - -CMD ["python3", "./highscores.py"] \ No newline at end of file diff --git a/docker/MySql/Dockerfile b/docker/MySql/Dockerfile deleted file mode 100644 index 6bc61c2..0000000 --- a/docker/MySql/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM mysql:latest - -COPY highscores_database.sql /docker-entrypoint-initdb.d/ \ No newline at end of file diff --git a/docker/MySql/highscores_database.sql b/highscores_database.sql similarity index 100% rename from docker/MySql/highscores_database.sql rename to highscores_database.sql