From 35c9e788091bd1954ff9ed48d0c02c5653682706 Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Sat, 24 Aug 2024 14:39:10 +0200
Subject: [PATCH] Update docker images

---
 docker/django  | 27 ++++++++++++---------------
 docker/webpack |  2 +-
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/docker/django b/docker/django
index 8088b05..6e0fb2c 100644
--- a/docker/django
+++ b/docker/django
@@ -1,7 +1,7 @@
 # stage 1
-FROM python:3.9-bullseye as backend
+FROM python:3.11-bookworm as backend
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install --yes --no-install-recommends \
         vim \
         curl \
         gettext \
@@ -14,15 +14,12 @@ RUN mkdir /app/media
 
 COPY ./requirements /app/requirements
 
-RUN pip install -r requirements/base.txt
+RUN pip install uv
+RUN uv pip install --requirement requirements/base.txt
 
 
 # stage 2
-FROM node:16-bullseye AS frontend-build
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        git \
-    && rm -rf /var/lib/apt/lists/*
+FROM node:lts AS frontend-build
 
 WORKDIR /app
 
@@ -36,9 +33,9 @@ RUN npm run build:prod
 
 
 # stage 3
-FROM python:3.9-bullseye as production
+FROM python:3.11-bookworm as production
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install --yes --no-install-recommends \
         postgresql-client \
         vim \
         curl \
@@ -51,7 +48,7 @@ RUN mkdir /app/logs
 RUN mkdir /app/media
 RUN mkdir /app/bin
 
-COPY --from=backend /usr/local/lib/python3.9 /usr/local/lib/python3.9
+COPY --from=backend /usr/local/lib/python3.11 /usr/local/lib/python3.11
 COPY --from=backend /usr/local/bin/celery /usr/local/bin/celery
 
 COPY ./bin/docker-entrypoint.sh /app/bin/docker-entrypoint.sh
@@ -62,7 +59,7 @@ COPY ./src /app/src
 
 COPY ./requirements /app/requirements
 
-RUN pip install -r requirements/production.txt
+RUN uv pip install --requirement requirements/production.txt
 
 RUN useradd -M -u 1000 newsreader
 RUN chown -R newsreader:newsreader /app
@@ -84,9 +81,9 @@ RUN python src/manage.py collectstatic --noinput
 
 
 # (optional) stage 4
-FROM python:3.9-bullseye as development
+FROM python:3.11-bookworm as development
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install --yes --no-install-recommends \
         vim \
         curl \
     && rm -rf /var/lib/apt/lists/*
@@ -103,7 +100,7 @@ COPY --from=backend /usr/local/lib/python3.9 /usr/local/lib/python3.9
 COPY --from=backend /usr/local/bin/celery /usr/local/bin/celery
 COPY --from=backend /app/src/ /app/src/
 
-RUN pip install -r requirements/development.txt
+RUN uv pip install --requirement requirements/development.txt
 
 RUN useradd -M -u 1000 newsreader
 RUN chown -R newsreader:newsreader /app
diff --git a/docker/webpack b/docker/webpack
index 17ea2bc..44322ce 100644
--- a/docker/webpack
+++ b/docker/webpack
@@ -1,4 +1,4 @@
-FROM node:16-bullseye
+FROM node:lts
 
 WORKDIR /app
 RUN mkdir /app/src