Updated main Dockerfile and entrypoint script with Charles' changes

Signed-off-by: Charlie Evans <charlie.glenn.evans.jr@gmail.com>

Author: hawk4031

Dockerfile

@@ -1,23 +1,45 @@
-FROM registry.access.redhat.com/ubi8/python-38:1-71.1634036286
+FROM python:3.9.13-slim-buster as base
 
-WORKDIR /opt/app-root/src
+# Setup env
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONFAULTHANDLER 1
 
-COPY --chown=1001:0 . .
-RUN chmod -R g=u .
 
-USER 1001
+FROM base AS python-deps
+
+# Install pipenv and compilation dependencies
+RUN pip install --no-cache-dir --upgrade pip==22.2.2 && \
+    pip install --no-cache-dir pipenv==2022.8.24 gunicorn==20.1.0 django==4.1 django_bootstrap4==22.2 django_extensions==3.2.0 django-allow-cidr==0.5.0 django_q==1.3.9 psycopg2-binary==2.9.3 whitenoise==6.2.0
+
+# Install python dependencies in /.venv
+WORKDIR /
+COPY Pipfile Pipfile.lock ./
+
+RUN PIPENV_VENV_IN_PROJECT=1 pipenv install --deploy
+
 
-ENV LC_ALL=C.UTF-8 \
-    LANG=C.UTF-8 \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONFAULTHANDLER=1
+FROM base AS runtime
+
+# Install extra packages
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends postgresql-client=11+200+deb10u4 iputils-ping=3:20180629-2+deb10u2 curl=7.64.0-4+deb10u2 && rm -rf /var/lib/apt/lists/*
+
+# Create and switch to a new user
+RUN useradd --create-home --uid 1001 --gid 0 appuser
+WORKDIR /home/appuser
+
+# Copy virtual env from python-deps stage
+COPY --from=python-deps /.venv /.venv
+ENV PATH="/.venv/bin:$PATH"
+
+# Install application into container
+COPY --chown=1001:0 . .
+RUN chmod -R g=u .
 
-# see issue https://github.com/pypa/pipenv/issues/4220 for pipenv version
-RUN pip install --no-cache-dir --upgrade pip==21.3.1 && \
-    pip install --no-cache-dir pipenv==2018.11.26 && \
-    pipenv install --system --dev
+USER appuser
 
 EXPOSE 8080
 
-ENTRYPOINT ["sh", "entrypoint.sh"]
-CMD ["gunicorn", "-b", "0.0.0.0:8080",  "--env", "DJANGO_SETTINGS_MODULE=cfc_project.settings", "cfc_project.wsgi", "--timeout 120"]
+CMD ["bash", "entrypoint.sh"]

entrypoint.sh

@@ -1,6 +1,22 @@
-#!/bin/sh
+#!/bin/bash
 
-# python3 manage.py migrate --no-input
-python3 manage.py collectstatic --no-input --clear
+if [[ ! -z ${POSTGRESQL_DATABASE_FILE} ]]; then
+  export POSTGRESQL_DATABASE=`cat $POSTGRESQL_DATABASE_FILE`
+fi
+if [[ ! -z ${POSTGRESQL_USER_FILE} ]]; then
+  export POSTGRESQL_USER=`cat $POSTGRESQL_USER_FILE`
+fi
+if [[ ! -z ${POSTGRESQL_PASSWORD_FILE} ]]; then
+  export POSTGRESQL_PASSWORD=`cat $POSTGRESQL_PASSWORD_FILE`
+fi
 
-exec "$@"
+python3 manage.py makemigrations
+python3 manage.py migrate
+python3 manage.py loaddata sources/cfc-seed.json
+
+TEST="${USE_SQLITE3:-False}"
+if [[ "${TEST,,}" == "true" ]]; then
+  python3 manage.py runserver 0.0.0.0:8080
+else
+  gunicorn -b 0.0.0.0:8080 --env DJANGO_SETTINGS_MODULE=cfc_project.settings cfc_project.wsgi --timeout 120
+fi