Merge branch 'main' into dependabot/docker/core/alpine-3.20

core/docker-entrypoint.sh

@@ -247,7 +247,17 @@ echo "HYPERKITTY_API_KEY not defined, skipping HyperKitty setup..."
 fi
 
 # Now chown the places where mailman wants to write stuff.
-chown -R mailman /opt/mailman
+VAR_DIR="/opt/mailman/var"
+# Check if the directory exists
+if [ ! -d "$VAR_DIR" ]; then
+  # Directory does not exist, so create it
+  mkdir -p "$VAR_DIR"
+  echo "Directory $VAR_DIR created."
+else
+  echo "Directory $VAR_DIR already exists."
+fi
+
+chown -R mailman $VAR_DIR
 
 # Generate the LMTP files for postfix if needed.
 su-exec mailman mailman aliases

postorius/Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.3
-FROM alpine:3.20.1
+FROM alpine:3.20.3
 
 # Install packages and dependencies for postorius and hyperkitty Add user for
 # executing apps, change ownership for uwsgi+django files and set execution

postorius/Dockerfile.dev

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.3
-FROM alpine:3.20.1
+FROM alpine:3.20.3
 
 ARG POSTORIUS_REF
 ARG DJ_MM3_REF

web/Dockerfile

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.3
-FROM alpine:3.20.1
+FROM alpine:3.20.3
 
 # Add requirements file.
 COPY requirements.txt /tmp/
@@ -28,6 +28,7 @@ RUN --mount=type=cache,target=/root/.cache \
 		diskcache \
 		django-utils-six \
 		tzdata \
+		pytz \
 		'django-allauth[socialaccount,openid]' \
 	&& apk del .build-deps \
 	&& addgroup -S mailman \

web/Dockerfile.dev

@@ -1,5 +1,5 @@
 # syntax = docker/dockerfile:1.3
-FROM alpine:3.20.1
+FROM alpine:3.20.3
 
 ARG POSTORIUS_REF
 ARG HYPERKITTY_REF

web/requirements.txt

@@ -1,4 +1,4 @@
 mailmanclient==3.3.5
 postorius==1.3.10
-hyperkitty==1.3.9
+hyperkitty==1.3.11
 django-mailman3==1.3.15