From 340719099c2e706dc79bff07a9824c15b25029dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jul 2024 07:40:50 +0000 Subject: [PATCH 01/10] Bump hyperkitty from 1.3.9 to 1.3.11 in /web Bumps [hyperkitty](https://gitlab.com/mailman/hyperkitty) from 1.3.9 to 1.3.11. - [Release notes](https://gitlab.com/mailman/hyperkitty/tags) - [Commits](https://gitlab.com/mailman/hyperkitty/compare/1.3.9...1.3.11) --- updated-dependencies: - dependency-name: hyperkitty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- web/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/requirements.txt b/web/requirements.txt index 5bf03cc..7400b73 100644 --- a/web/requirements.txt +++ b/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 \ No newline at end of file From 9207cd189563e0e3922961736fcb3e8862080297 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 07:11:38 +0000 Subject: [PATCH 02/10] Bump alpine from 3.20.1 to 3.20.2 in /postorius Bumps alpine from 3.20.1 to 3.20.2. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 8c99871..5c8bdd2 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.20.1 +FROM alpine:3.20.2 # Install packages and dependencies for postorius and hyperkitty Add user for # executing apps, change ownership for uwsgi+django files and set execution diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 85e75bb..5a27c5c 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.20.1 +FROM alpine:3.20.2 ARG POSTORIUS_REF ARG DJ_MM3_REF From 47271240f4885f8808e99522013b8fe79cba4157 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 07:33:50 +0000 Subject: [PATCH 03/10] Bump alpine from 3.20.1 to 3.20.2 in /web Bumps alpine from 3.20.1 to 3.20.2. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 81d5f3b..ad9ec3e 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.20.1 +FROM alpine:3.20.2 # Add requirements file. COPY requirements.txt /tmp/ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 73f8a76..dca67ab 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.20.1 +FROM alpine:3.20.2 ARG POSTORIUS_REF ARG HYPERKITTY_REF From 322bbea489772ca657b5573a76c186297ce2dab1 Mon Sep 17 00:00:00 2001 From: SimonTagne <40598597+SimonTagne@users.noreply.github.com> Date: Wed, 28 Aug 2024 19:40:15 +0200 Subject: [PATCH 04/10] Install pytz to web I get a 500 in hyperkitty search without it --- web/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/web/Dockerfile b/web/Dockerfile index ad9ec3e..a2c0559 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -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 \ From a227c995fd5e3dc533f5237d411562a4aacde2b3 Mon Sep 17 00:00:00 2001 From: Pierre-Gildas MILLON <715479+pgmillon@users.noreply.github.com> Date: Thu, 29 Aug 2024 16:11:41 +0200 Subject: [PATCH 05/10] fix: core startup fails if /opt/mailman/mailman-extra.cfg is read-only --- core/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/docker-entrypoint.sh b/core/docker-entrypoint.sh index 3e544bb..9ac8fbe 100755 --- a/core/docker-entrypoint.sh +++ b/core/docker-entrypoint.sh @@ -247,7 +247,7 @@ 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 +chown -R mailman /opt/mailman/var # Generate the LMTP files for postfix if needed. su-exec mailman mailman aliases From 6f193390a34df287d7d3f41f7aef797a632ab041 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Thu, 29 Aug 2024 20:58:41 -0700 Subject: [PATCH 06/10] Fix spacing --- web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/Dockerfile b/web/Dockerfile index a2c0559..ee761c4 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -28,7 +28,7 @@ RUN --mount=type=cache,target=/root/.cache \ diskcache \ django-utils-six \ tzdata \ - pytz \ + pytz \ 'django-allauth[socialaccount,openid]' \ && apk del .build-deps \ && addgroup -S mailman \ From 2a1e5645c656368f47e93ff016f7e9be5ba6aa8b Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Thu, 29 Aug 2024 21:00:03 -0700 Subject: [PATCH 07/10] Use tabs in the list of packages --- web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/Dockerfile b/web/Dockerfile index ee761c4..805e097 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -28,7 +28,7 @@ RUN --mount=type=cache,target=/root/.cache \ diskcache \ django-utils-six \ tzdata \ - pytz \ + pytz \ 'django-allauth[socialaccount,openid]' \ && apk del .build-deps \ && addgroup -S mailman \ From fcf719625cc6428bb8e01855c35e095f3d93ef3d Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sat, 31 Aug 2024 15:09:15 +0000 Subject: [PATCH 08/10] Create the var directory before trying to chown. During cold start, var directory may not exist and we try to chown the var directory which fails if it doesn't exist. We want to make and chown the var directory in that case otherwise, mailman will not be able to write to path `/opt/mailman` to create it's own var directory. --- core/docker-entrypoint.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/core/docker-entrypoint.sh b/core/docker-entrypoint.sh index 9ac8fbe..519ad2f 100755 --- a/core/docker-entrypoint.sh +++ b/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 +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 From abdabde99dd2fc890917f65c40148c26db654a70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 07:36:41 +0000 Subject: [PATCH 09/10] Bump alpine from 3.20.2 to 3.20.3 in /web Bumps alpine from 3.20.2 to 3.20.3. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 805e097..4d3d66f 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.20.2 +FROM alpine:3.20.3 # Add requirements file. COPY requirements.txt /tmp/ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index dca67ab..bb7f15d 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.20.2 +FROM alpine:3.20.3 ARG POSTORIUS_REF ARG HYPERKITTY_REF From 8aa3207ab5e3ffa757a92ed446fe2631db938d88 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 07:49:49 +0000 Subject: [PATCH 10/10] Bump alpine from 3.20.2 to 3.20.3 in /postorius Bumps alpine from 3.20.2 to 3.20.3. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 5c8bdd2..b6b7b30 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.20.2 +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 diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 5a27c5c..4807e94 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.20.2 +FROM alpine:3.20.3 ARG POSTORIUS_REF ARG DJ_MM3_REF