From acd37809aa3072aeab4b6ff227bb109b4a3c9187 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Thu, 28 Sep 2023 10:48:40 -0400 Subject: [PATCH] fixes docker build issues --- Dockerfile-MySQL | 12 +++++------- Dockerfile-sqlite | 8 +++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Dockerfile-MySQL b/Dockerfile-MySQL index 952b790..413a3f5 100644 --- a/Dockerfile-MySQL +++ b/Dockerfile-MySQL @@ -1,5 +1,5 @@ -FROM python:3.9-slim-buster -MAINTAINER Craig Harman +FROM python:3.10-slim-bullseye +MAINTAINER Cash Costello LABEL Description="Image for running a Turkle interface using MySQL" WORKDIR /opt/turkle @@ -7,10 +7,8 @@ COPY requirements.txt /opt/turkle/requirements.txt RUN set -eux; \ apt-get update; \ - apt-get install -y --no-install-recommends cron default-libmysqlclient-dev build-essential; \ - pip install --no-cache-dir --upgrade pip; \ - pip install --no-cache-dir --upgrade -r requirements.txt; \ - pip install --no-cache-dir gunicorn mysqlclient whitenoise; \ + apt-get install -y --no-install-recommends cron default-libmysqlclient-dev build-essential pkg-config; \ + pip install --no-cache-dir --upgrade -r requirements.txt gunicorn mysqlclient whitenoise; \ apt-get remove --purge -y build-essential; \ apt-get autoremove -y; \ rm -rf /var/lib/apt/lists/* @@ -30,4 +28,4 @@ VOLUME /opt/turkle EXPOSE 8080 -CMD [ "/usr/local/bin/entrypoint.sh" ] \ No newline at end of file +CMD [ "/usr/local/bin/entrypoint.sh" ] diff --git a/Dockerfile-sqlite b/Dockerfile-sqlite index f6f494a..2def52b 100644 --- a/Dockerfile-sqlite +++ b/Dockerfile-sqlite @@ -1,5 +1,5 @@ -FROM python:3.9-slim-buster -MAINTAINER Craig Harman +FROM python:3.10-slim-bullseye +MAINTAINER Cash Costello LABEL Description="Image for running a Turkle interface using sqlite" RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -9,9 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ WORKDIR /opt/turkle COPY requirements.txt /opt/turkle/requirements.txt -RUN pip install --no-cache-dir --upgrade pip && \ - pip install --no-cache-dir --upgrade -r requirements.txt && \ - pip install --no-cache-dir gunicorn whitenoise +RUN pip install --no-cache-dir --upgrade -r requirements.txt gunicorn whitenoise COPY turkle /opt/turkle/turkle COPY manage.py /opt/turkle/manage.py