diff --git a/Dockerfile b/Dockerfile index 7cb731b..9f5b3b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,14 @@ # Based off of https://github.com/minimaxir/gpt-2-cloud-run/blob/master/Dockerfile -FROM python:3.8-slim-buster +FROM python:3.10-slim-buster WORKDIR /code -RUN pip3 --no-cache-dir install -U py-cord==2.0.0b5 python-dotenv +# opencv dependencies https://stackoverflow.com/a/63377623 +RUN apt-get update && apt-get install -y ffmpeg libsm6 libxext6 && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -COPY .env src/ secret-scholars-bot-config.json ./ +RUN pip3 --no-cache-dir install -U py-cord python-dotenv markovchain pillow opencv-python + +COPY .env src/ secret-scholars-bot-config.json markov.txt ./ RUN printf "build_time=%s" "'`date -Iseconds`'" > autogen_buildtime.py diff --git a/Dockerfile-arm32v6 b/Dockerfile-arm32v6 index 92f0490..930eb91 100644 --- a/Dockerfile-arm32v6 +++ b/Dockerfile-arm32v6 @@ -1,14 +1,16 @@ # Based off of https://github.com/minimaxir/gpt-2-cloud-run/blob/master/Dockerfile FROM arm32v6/python:3.8-alpine -RUN apk update && apk add gcc musl-dev +RUN apk update && apk add gcc musl-dev py3-opencv zlib-dev jpeg-dev WORKDIR /code -RUN pip3 --no-cache-dir install -U py-cord==2.0.0b5 python-dotenv +ENV PYTHONPATH=$PYTHONPATH:/usr/lib/python3.10/site-packages + +RUN pip3 --no-cache-dir install -U py-cord python-dotenv markovchain pillow COPY .env src/ secret-scholars-bot-config.json ./ RUN printf "build_time=%s" "'`date -Iseconds`'" > autogen_buildtime.py -CMD [ "python", "./bot.py" ] +# CMD [ "python", "./bot.py" ] diff --git a/README.md b/README.md index f6a09e8..a1e6ffc 100644 --- a/README.md +++ b/README.md @@ -35,5 +35,5 @@ docker run -d secret-scholars-bot ### ARM32v6 Run ```sh -docker run -d secret-scholars-bot secret-scholars-bot:arm32v6 +docker run -d secret-scholars-bot:arm32v6 ```