From 0effb444024db95e6ccba9028e6058059508934a Mon Sep 17 00:00:00 2001
From: Matthias Mair <code@mjmair.com>
Date: Sun, 21 Jul 2024 23:46:41 +0200
Subject: [PATCH] Bump docker image alpine base from 3.18 to 3.20 (#7699)

* bump docker image from 3.18 to 3.20

* bump postgres from 13 to 14
---
 .devcontainer/docker-compose.yml            | 2 +-
 contrib/container/Dockerfile                | 4 ++--
 contrib/container/dev-docker-compose.yml    | 2 +-
 contrib/container/docker-compose.yml        | 2 +-
 contrib/container/install_build_packages.sh | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index aa549c0361..9fc7fd092f 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   db:
-    image: postgres:13
+    image: postgres:14
     restart: unless-stopped
     expose:
       - 5432/tcp
diff --git a/contrib/container/Dockerfile b/contrib/container/Dockerfile
index 572a286f5d..63e5013524 100644
--- a/contrib/container/Dockerfile
+++ b/contrib/container/Dockerfile
@@ -9,7 +9,7 @@
 # - Runs InvenTree web server under django development server
 # - Monitors source files for any changes, and live-reloads server
 
-ARG base_image=python:3.11-alpine3.18
+ARG base_image=python:3.11-alpine3.20
 FROM ${base_image} AS inventree_base
 
 # Build arguments for this image
@@ -64,7 +64,7 @@ RUN apk add --no-cache \
     # Weasyprint requirements : https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#alpine-3-12
     py3-pip py3-pillow py3-cffi py3-brotli pango poppler-utils openldap \
     # Postgres client
-    postgresql13-client \
+    postgresql14-client \
     # MySQL / MariaDB client
     mariadb-client mariadb-connector-c \
     && \
diff --git a/contrib/container/dev-docker-compose.yml b/contrib/container/dev-docker-compose.yml
index 4b84be12a5..0fcffdc20b 100644
--- a/contrib/container/dev-docker-compose.yml
+++ b/contrib/container/dev-docker-compose.yml
@@ -20,7 +20,7 @@ services:
     # Use PostgreSQL as the database backend
     # Note: This can be changed to a different backend if required
     inventree-dev-db:
-        image: postgres:13
+        image: postgres:14
         expose:
             - 5432/tcp
         environment:
diff --git a/contrib/container/docker-compose.yml b/contrib/container/docker-compose.yml
index de38b655b8..f565138c51 100644
--- a/contrib/container/docker-compose.yml
+++ b/contrib/container/docker-compose.yml
@@ -38,7 +38,7 @@ services:
     # Database service
     # Use PostgreSQL as the database backend
     inventree-db:
-        image: postgres:13
+        image: postgres:14
         container_name: inventree-db
         expose:
             - ${INVENTREE_DB_PORT:-5432}/tcp
diff --git a/contrib/container/install_build_packages.sh b/contrib/container/install_build_packages.sh
index 358a256e7f..f549b867fd 100644
--- a/contrib/container/install_build_packages.sh
+++ b/contrib/container/install_build_packages.sh
@@ -1,12 +1,12 @@
 #!/bin/ash
 
 # Install system packages required for building InvenTree python libraries
-# Note that for postgreslql, we use the 13 version, which matches the version used in the InvenTree docker image
+# Note that for postgreslql, we use the 14 version, which matches the version used in the InvenTree docker image
 
 apk add gcc g++ musl-dev openssl-dev libffi-dev cargo python3-dev openldap-dev \
     libstdc++ build-base linux-headers py3-grpcio \
     jpeg-dev openjpeg-dev libwebp-dev zlib-dev \
     sqlite sqlite-dev \
     mariadb-connector-c-dev mariadb-client mariadb-dev \
-    postgresql13-dev postgresql-libs \
+    postgresql14-dev postgresql-libs \
     $@