From 42b74c4951ec54ff4a718fb85ac5eab8bd94faf2 Mon Sep 17 00:00:00 2001
From: Gabriel Augendre <gabriel@augendre.info>
Date: Sat, 25 Mar 2023 20:18:13 +0100
Subject: [PATCH] Update dockerfile

---
 Dockerfile               | 94 ++++++++++++++++++++--------------------
 src/checkout/settings.py |  3 +-
 2 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 19932c8..2953f3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,61 +1,63 @@
-## Build venv
-FROM python:3.10.4-bullseye AS venv
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    gettext
-
-# https://python-poetry.org/docs/#installation
-ENV POETRY_VERSION=1.1.13
-RUN curl -sSL https://install.python-poetry.org | python3 -
-
-ENV PATH /root/.local/bin:$PATH
-ARG POETRY_OPTIONS
+##############################################
+# write git info
+##############################################
+FROM alpine/git:v2.36.3 AS git
 
 WORKDIR /app
+COPY .git /app/.git/
+RUN git describe --tags --always > /git-describe
+RUN git rev-parse HEAD > /git-commit
+RUN date +'%Y-%m-%d %H:%M %Z' > /build-date
 
-COPY pyproject.toml poetry.lock ./
 
-RUN python -m venv --copies /app/venv \
-    && . /app/venv/bin/activate \
-    && poetry install $POETRY_OPTIONS
 
-ENV PATH /app/venv/bin:$PATH
-COPY src ./src/
-RUN python ./src/manage.py collectstatic --no-input
-RUN python ./src/manage.py compilemessages -l fr -l en
+##############################################
+# Main image
+##############################################
+FROM python:3.11.2-slim-bullseye AS final
 
-## Get git versions
-FROM alpine/git AS git
-ADD . /app
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Setup user & group
+##############################################
+RUN groupadd -g 1000 django
+RUN useradd -M -d /app -u 1000 -g 1000 -s /bin/bash django
+
+# Setup system
+##############################################
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+        libxml2 \
+        media-types
+
+# Fetch project requirements
+##############################################
+COPY --chown=django:django --from=git /git-describe /git-commit /build-date /app/git/
+
+# Create directory structure
+##############################################
 WORKDIR /app
-RUN git rev-parse HEAD | tee /version
+COPY --chown=django:django pyproject.toml requirements.txt ./
+ADD --chown=django:django ./src ./src
+COPY --chown=django:django tasks.py ./tasks.py
 
+RUN mkdir -p /app/data /app/db
+RUN chown django:django /app /app/data /app/db
 
-## Beginning of runtime image
-FROM python:3.10.4-slim-bullseye as prod
-ENV TZ "Europe/Paris"
-RUN mkdir -p /app/db
-
-COPY --from=venv /app/venv /app/venv/
-ENV PATH /app/venv/bin:$PATH
-
-WORKDIR /app
-COPY LICENSE pyproject.toml ./
-COPY docker ./docker/
-COPY src ./src/
-COPY --from=git /version /app/.version
-COPY --from=venv /app/staticfiles /app/staticfiles/
-
+ENV STATIC_ROOT=/app/static
 ENV SECRET_KEY "changeme"
 ENV DEBUG "false"
 ENV DB_BASE_DIR "/app/db"
-#ENV HOSTS="host1;host2"
-#ENV ADMINS='Full Name,email@example.com'
-#ENV MAILGUN_API_KEY='key-yourapikey'
-#ENV MAILGUN_SENDER_DOMAIN='mailgun.example.com'
-#ENV BLOG_BASE_URL='https://url-of-your-blog.example.com'
+
+RUN python -m pip install --no-cache-dir -r requirements.txt
+WORKDIR /app/src
+RUN python manage.py collectstatic --noinput --clear
+
+EXPOSE 8000
+
+WORKDIR /app/src
 
 HEALTHCHECK --start-period=30s CMD python -c "import requests; requests.get('http://localhost:8000', timeout=2)"
 
-WORKDIR /app/src
-CMD ["/app/docker/run.sh"]
+USER django
+CMD ["gunicorn", "checkout.wsgi", "--graceful-timeout=5", "--worker-tmp-dir=/dev/shm", "--workers=2", "--threads=4", "--worker-class=gthread", "--bind=0.0.0.0:8000", "--log-file=-"]
diff --git a/src/checkout/settings.py b/src/checkout/settings.py
index f76eabd..1566242 100644
--- a/src/checkout/settings.py
+++ b/src/checkout/settings.py
@@ -29,6 +29,7 @@ env = environ.Env(
     DB_BASE_DIR=(Path, BASE_DIR),
     TIME_ZONE=(str, "Europe/Paris"),
     LANGUAGE_CODE=(str, "fr-fr"),
+    STATIC_ROOT=(Path, BASE_DIR.parent / "staticfiles"),
 )
 
 env_file = os.getenv("ENV_FILE", None)
@@ -193,7 +194,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/3.1/howto/static-files/
 
 STATIC_URL = "static/"
-STATIC_ROOT = BASE_DIR.parent / "staticfiles"
+STATIC_ROOT = env("STATIC_ROOT")
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 
 MEDIA_URL = "media/"