diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..90fd46c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,34 @@ +# Pull Python 3.8.1 on alpine +FROM python:3.8.1-alpine + +RUN apk --no-cache add gcc \ + musl-dev \ + python3-dev + +# Create a new user to run as and set the working directory +ENV USER=covidbot +ENV UID=991 +ENV GID=991 + +RUN addgroup -g "${GID}" covidbot +RUN adduser \ + --disabled-password \ + --gecos "" \ + --home "/home/covidbot" \ + --ingroup "${USER}" \ + --uid "${UID}" \ + "${USER}" + +USER covidbot +WORKDIR /home/covidbot/ +ENV PATH="${PATH}:/home/covidbot/.local/bin" +RUN echo "${PATH}" + +COPY Pipfile Pipfile + +RUN pip install pipenv +RUN pipenv install Pipfile + +COPY covid_bot.py covid_bot.py + +ENTRYPOINT [ "pipenv", "run", "python", "covid_bot.py" ] \ No newline at end of file diff --git a/covid_bot.py b/covid_bot.py index 8230e60..52195a2 100644 --- a/covid_bot.py +++ b/covid_bot.py @@ -2,7 +2,7 @@ import discord from discord.ext import commands -from parse_data import update_data, get_covid_data, covid_db +from lib.parse_data import update_data, get_covid_data, covid_db from re import match from datetime import datetime from asyncio import sleep diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..b2effcd --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,13 @@ +--- +version: "3" +services: + covidbot: + build: + context: . + dockerfile: Dockerfile + image: covidbot:latest + user: covidbot + container_name: covidbot_container_service + volumes: + - ./lib:/home/covidbot/lib + - ./.keys:/home/covidbot/.keys diff --git a/lib/__init__.py b/lib/__init__.py new file mode 100755 index 0000000..e69de29 diff --git a/covidData.py b/lib/covidData.py old mode 100644 new mode 100755 similarity index 100% rename from covidData.py rename to lib/covidData.py diff --git a/parse_data.py b/lib/parse_data.py old mode 100644 new mode 100755 similarity index 92% rename from parse_data.py rename to lib/parse_data.py index e9ead79..18ae751 --- a/parse_data.py +++ b/lib/parse_data.py @@ -2,7 +2,10 @@ import requests from bs4 import BeautifulSoup -from covidData import covidData +try: + from covidData import covidData +except: + from lib.covidData import covidData # temporary database covid_db = {}