Merge pull request #206 from hltcoe/fix_docker

fixes docker build issues

Dockerfile-MySQL

@@ -1,16 +1,14 @@
-FROM python:3.9-slim-buster
-MAINTAINER Craig Harman <[email protected]>
+FROM python:3.10-slim-bullseye
+MAINTAINER Cash Costello <[email protected]>
 LABEL Description="Image for running a Turkle interface using MySQL"
 
 WORKDIR /opt/turkle
 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" ]
+CMD [ "/usr/local/bin/entrypoint.sh" ]

Dockerfile-sqlite

@@ -1,5 +1,5 @@
-FROM python:3.9-slim-buster
-MAINTAINER Craig Harman <[email protected]>
+FROM python:3.10-slim-bullseye
+MAINTAINER Cash Costello <[email protected]>
 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