Merge pull request #55 from defencedigital/postgres-migration

Reverts to working Dockerfile for django - using RHEL builder

1 files changed, 27 insertions, 22 deletions

diff --git a/Dockerfile b/Dockerfile
index 93a0148..bba15d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,39 @@
 # Builder stage
-#FROM registry.access.redhat.com/ubi9/python-311:1-52.1712567218 AS builder
-#FROM registry.access.redhat.com/ubi9/python-312
-FROM registry.access.redhat.com/ubi9/ubi-minimal
-RUN microdnf install -y \
-    gcc \
-    python3.12 \
-    python3.12-devel \
-    python3.12-pip \
-    postgresql-devel \
-    tzdata \
-    && microdnf clean all
+FROM registry.access.redhat.com/ubi9/python-311:1-52.1712567218 AS builder
+
+# Add application sources
+USER 0
+COPY . /app
+RUN mkdir -p /app/static/css /app/static/js /app/static/img
+RUN chown -R 1001:0 /app
+USER 1001
 
 WORKDIR /app
 
-#COPY ./requirements.txt .
-COPY . .
+ENV DJANGO_SETTINGS_MODULE=conf.settings.base
 
-# # Add application sources
-# USER 0
-# COPY . /app
-# RUN mkdir -p /app/static/css /app/static/js /app/static/img
-# RUN chown -R 1001:0 /app
-# USER 1001
+# Install dependencies
+RUN pip install -U "pip>=24.0.0" && \
+    pip install -r requirements.txt && \
+    python manage.py collectstatic --noinput
 
+# Final stage
+FROM python:3.11-slim
 
-# Install dependencies
-RUN python3.12 -m pip install -r requirements.txt
+# Set working directory
+WORKDIR /app
+
+# Copy from builder
+COPY --from=builder /app /app
+
+RUN apt update && apt install -y --no-install-recommends libpq-dev build-essential
+
+# Install packages
+RUN pip install -r requirements.txt
+
+ENV DJANGO_SETTINGS_MODULE=conf.settings.local
 
 EXPOSE 8000
 
 # Start app
 CMD ["gunicorn", "ded.wsgi:application", "--bind", "0.0.0.0:8000"]
-