From 66b230baefb413ab15278b560b6f13b075add503 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 31 Aug 2022 10:55:03 -0700 Subject: [PATCH 001/101] Add lynx to the mailman core Docker image Mailman's convert_html_to_plaintext setting relies on the value of html_to_plain_text_command which is by default set to: /usr/bin/lynx -dump $filename This will fail on the current image because lynx is not installed. Simply add lynx to the list of packages to install to correct this. The file path for the lynx command installed via the Alpine package does seem to be /usr/bin/lynx which means we don't need to update any configuration to use this command. The defaults are sufficient. --- core/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/Dockerfile b/core/Dockerfile index ca904e6..9b80900 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -9,6 +9,8 @@ RUN --mount=type=cache,target=/root/.cache \ apk update \ && apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev \ libffi-dev \ + # Mailman html to plaintext conversion uses lynx. + && apk add --no-cache lynx \ # psutil needs linux-headers to compile on musl c library. && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c \ && python3 -m pip install -U pip setuptools wheel \ From 560e26fbd70e1588e4ae3702ce3d899c6e86306b Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Tue, 25 Oct 2022 23:24:55 -0700 Subject: [PATCH 002/101] Store the logs for jobs for inspection on failures --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2aaaa5..1cc8dcb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,6 +42,11 @@ jobs: command: | python3 --version python3 deploy.py + - store_artifacts: + path: /opt/mailman/web/logs/ + + - store_artifacts: + path: /opt/mailman/core/var/logs workflows: version: 2 From 208017f9a00fdaf1b2d0671e97fb879e804fd911 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Tue, 25 Oct 2022 23:25:57 -0700 Subject: [PATCH 003/101] Test dependabot for Dockerfiles & Bump Postgres to 11 (#557) * Test dependabot for Dockerfiles. * Also for github actions * Update dependabot.yml * Fix urls.py for new versions of Django * Fix urls.py for postorius. * Bump dependency on Postgresql. * Bump dependency on Django * Add dependency on tzdata. --- .github/dependabot.yml | 18 ++++++++++++++++++ docker-compose.yaml | 4 ++-- postorius/mailman-web/urls.py | 15 +++++++-------- web/Dockerfile.dev | 5 +++-- web/mailman-web/urls.py | 17 ++++++++--------- 5 files changed, 38 insertions(+), 21 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b849982 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,18 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "docker" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" + # Enable version updates for Actions + - package-ecosystem: "github-actions" + # Look for `.github/workflows` in the `root` directory + directory: "/" + # Check for updates once a week + schedule: + interval: "weekly" diff --git a/docker-compose.yaml b/docker-compose.yaml index 5390bf1..ecc7ec9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -49,7 +49,7 @@ services: - POSTGRES_DB=mailmandb - POSTGRES_USER=mailman - POSTGRES_PASSWORD=mailmanpass - image: postgres:9.6-alpine + image: postgres:11-alpine volumes: - /opt/mailman/database:/var/lib/postgresql/data networks: @@ -62,4 +62,4 @@ networks: driver: default config: - - subnet: 172.19.199.0/24 \ No newline at end of file + subnet: 172.19.199.0/24 diff --git a/postorius/mailman-web/urls.py b/postorius/mailman-web/urls.py index 804b9e3..6a9bbaf 100644 --- a/postorius/mailman-web/urls.py +++ b/postorius/mailman-web/urls.py @@ -16,19 +16,18 @@ # You should have received a copy of the GNU General Public License along with # Postorius. If not, see . - -from django.conf.urls import include, url +from django.conf.urls import include from django.contrib import admin -from django.urls import reverse_lazy +from django.urls import path, reverse_lazy from django.views.generic import RedirectView urlpatterns = [ - url(r'^$', RedirectView.as_view( + path(r'^$', RedirectView.as_view( url=reverse_lazy('list_index'), permanent=True)), - url(r'^postorius/', include('postorius.urls')), - url(r'', include('django_mailman3.urls')), - url(r'^accounts/', include('allauth.urls')), + path(r'postorius/', include('postorius.urls')), + path(r'', include('django_mailman3.urls')), + path(r'accounts/', include('allauth.urls')), # Django admin - url(r'^admin/', admin.site.urls), + path(r'^admin/', admin.site.urls), ] diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 9b2809c..b43e005 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -33,10 +33,11 @@ RUN --mount=type=cache,target=/root/.cache \ mysqlclient \ xapian-haystack \ django-auth-ldap \ - python-memcached \ + python-memcached \ + tzdata \ diskcache \ django-utils-six \ - && python3 -m pip install -U 'Django<3.2' \ + && python3 -m pip install -U 'Django<4.3' \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ diff --git a/web/mailman-web/urls.py b/web/mailman-web/urls.py index e8bb66c..0e14f66 100644 --- a/web/mailman-web/urls.py +++ b/web/mailman-web/urls.py @@ -16,20 +16,19 @@ # You should have received a copy of the GNU General Public License along with # Postorius. If not, see . - -from django.conf.urls import include, url +from django.conf.urls import include from django.contrib import admin -from django.urls import reverse_lazy +from django.urls import path, reverse_lazy from django.views.generic import RedirectView urlpatterns = [ - url(r'^$', RedirectView.as_view( + path(r'^$', RedirectView.as_view( url=reverse_lazy('list_index'), permanent=True)), - url(r'^postorius/', include('postorius.urls')), - url(r'^hyperkitty/', include('hyperkitty.urls')), - url(r'', include('django_mailman3.urls')), - url(r'^accounts/', include('allauth.urls')), + path(r'postorius/', include('postorius.urls')), + path(r'hyperkitty/', include('hyperkitty.urls')), + path(r'', include('django_mailman3.urls')), + path(r'accounts/', include('allauth.urls')), # Django admin - url(r'^admin/', admin.site.urls), + path(r'^admin/', admin.site.urls), ] From 04be7fd46a4de2e6b52498ab46a611f170d9f31d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 06:26:18 +0000 Subject: [PATCH 004/101] Bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_docs.yml b/.github/workflows/publish_docs.yml index 2d202e6..44a503f 100644 --- a/.github/workflows/publish_docs.yml +++ b/.github/workflows/publish_docs.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout main - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Deploy docs uses: mhausenblas/mkdocs-deploy-gh-pages@master From 06576b608a4e1b8bc6758c27752c15069c5beb51 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Tue, 25 Oct 2022 23:28:48 -0700 Subject: [PATCH 005/101] Add more specific file path for Dockerfile check --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b849982..81fd7dc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,7 +6,7 @@ version: 2 updates: - package-ecosystem: "docker" # See documentation for possible values - directory: "/" # Location of package manifests + directory: "/core" # Location of package manifests schedule: interval: "weekly" # Enable version updates for Actions From 9ab058b3480fbe0127c4df4e52910a115fad61c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 06:46:31 +0000 Subject: [PATCH 006/101] Bump alpine from 3.12 to 3.16.2 in /core Bumps alpine from 3.12 to 3.16.2. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/Dockerfile | 2 +- core/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index ca904e6..c916a7c 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.12 +FROM alpine:3.16.2 #Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index bb0c0b8..186c43e 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.12 +FROM alpine:3.16.2 #Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ From c9b7cf0d26782e439c538963a1adbd4be0709b01 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Tue, 25 Oct 2022 23:51:03 -0700 Subject: [PATCH 007/101] Update dockerfiles for all images. --- .github/dependabot.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 81fd7dc..0c2dd78 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,14 @@ updates: directory: "/core" # Location of package manifests schedule: interval: "weekly" + - package-ecosystem: "docker" # See documentation for possible values + directory: "/web" # Location of package manifests + schedule: + interval: "weekly" + - package-ecosystem: "docker" # See documentation for possible values + directory: "/postorius" # Location of package manifests + schedule: + interval: "weekly" # Enable version updates for Actions - package-ecosystem: "github-actions" # Look for `.github/workflows` in the `root` directory From 76c803e18a24da5f6234bc66ca1e30e55a7858cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 07:00:22 +0000 Subject: [PATCH 008/101] Bump alpine from 3.12 to 3.16.2 in /web Bumps alpine from 3.12 to 3.16.2. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... 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 297f074..cd0c94e 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.12 +FROM alpine:3.16.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index b43e005..9049528 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.12 +FROM alpine:3.16.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From c5174266521814e53032da7c382d7fea2d9dc246 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 07:00:22 +0000 Subject: [PATCH 009/101] Bump alpine from 3.12 to 3.16.2 in /postorius Bumps alpine from 3.12 to 3.16.2. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... 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 408c832..fbf2d81 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.12 +FROM alpine:3.16.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index e427a1c..bedac05 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.12 +FROM alpine:3.16.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From 312833c8ab9386598c64a8e5eda986f647e3f69a Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 13:05:17 +0530 Subject: [PATCH 010/101] Bump to new releases --- core/Dockerfile | 2 +- postorius/Dockerfile | 4 ++-- web/Dockerfile | 10 +++++----- web/Dockerfile.dev | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index c916a7c..ce97fee 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/root/.cache \ && python3 -m pip install -U pip setuptools wheel \ && python3 -m pip install psycopg2 \ gunicorn==19.9.0 \ - mailman==3.3.5 \ + mailman==3.3.6 \ mailman-hyperkitty==1.2.0 \ pymysql \ 'sqlalchemy<1.4.0' \ diff --git a/postorius/Dockerfile b/postorius/Dockerfile index fbf2d81..c678763 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -16,8 +16,8 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip libffi libuuid pcre-dev py-cryptography \ - && python3 -m pip install -U 'Django<3.2' pip setuptools wheel \ - && python3 -m pip install postorius==1.3.6 \ + && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ + && python3 -m pip install postorius==1.3.7 \ uwsgi \ 'psycopg2<2.9' \ dj-database-url \ diff --git a/web/Dockerfile b/web/Dockerfile index cd0c94e..d98e8a9 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -16,11 +16,11 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ - && python3 -m pip install -U 'Django<3.2' pip setuptools wheel \ - && pip install mailmanclient==3.3.3 \ - postorius==1.3.6 \ - hyperkitty==1.3.5 \ - django-mailman3==1.3.7 \ + && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ + && pip install mailmanclient==3.3.4 \ + postorius==1.3.7 \ + hyperkitty==1.3.6 \ + django-mailman3==1.3.8 \ mistune==2.0.0rc1 \ whoosh \ uwsgi \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 9049528..8a1f466 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -37,7 +37,7 @@ RUN --mount=type=cache,target=/root/.cache \ tzdata \ diskcache \ django-utils-six \ - && python3 -m pip install -U 'Django<4.3' \ + && python3 -m pip install -U 'Django<4.2' \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ From 5fe9f30fd5dda3c70a48d218acf904f70abccb01 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 13:17:23 +0530 Subject: [PATCH 011/101] Remove constraint on mistune --- web/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/web/Dockerfile b/web/Dockerfile index d98e8a9..07be720 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -21,7 +21,6 @@ RUN --mount=type=cache,target=/root/.cache \ postorius==1.3.7 \ hyperkitty==1.3.6 \ django-mailman3==1.3.8 \ - mistune==2.0.0rc1 \ whoosh \ uwsgi \ 'psycopg2<2.9' \ From bfb4d9da3b8857c7d173f1be69bd527408e41101 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 00:51:11 -0700 Subject: [PATCH 012/101] Add lynx to existing apk add command. --- core/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index 9b80900..3a4ee7d 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -10,9 +10,8 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --virtual build-deps gcc python3-dev musl-dev postgresql-dev \ libffi-dev \ # Mailman html to plaintext conversion uses lynx. - && apk add --no-cache lynx \ # psutil needs linux-headers to compile on musl c library. - && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c \ + && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c lynx \ && python3 -m pip install -U pip setuptools wheel \ && python3 -m pip install psycopg2 \ gunicorn==19.9.0 \ From 21155c1498281e6511cde15be2882bfbb9fc5f15 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 13:41:52 +0530 Subject: [PATCH 013/101] Add dependency on tzdata --- web/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/web/Dockerfile b/web/Dockerfile index 07be720..49d6acb 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -32,6 +32,7 @@ RUN --mount=type=cache,target=/root/.cache \ python-memcached \ diskcache \ django-utils-six \ + tzdata \ && apk del .build-deps \ && addgroup -S mailman \ && adduser -S -G mailman mailman \ From 9fcf93aa82bb2bf046317811a2468489a6d387e0 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 01:30:07 -0700 Subject: [PATCH 014/101] Use requirements.txt for automated version bumps. (#566) * Use requirements.txt for automated version bumps. Move the Mailman requirements into requirements.txt file so that we can use dependabot for automated version bumping. * Remove constraint on mistune * Add requirements file to dockerfile * Add dependency on tzdata --- .github/dependabot.yml | 14 +++++++++++--- core/Dockerfile | 6 ++++-- core/requirements.txt | 5 +++++ web/Dockerfile | 7 +++---- web/requirements.txt | 4 ++++ 5 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 core/requirements.txt create mode 100644 web/requirements.txt diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0c2dd78..50043f6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,15 +12,23 @@ updates: - package-ecosystem: "docker" # See documentation for possible values directory: "/web" # Location of package manifests schedule: - interval: "weekly" + interval: "weekly" - package-ecosystem: "docker" # See documentation for possible values directory: "/postorius" # Location of package manifests schedule: - interval: "weekly" + interval: "weekly" # Enable version updates for Actions - package-ecosystem: "github-actions" # Look for `.github/workflows` in the `root` directory directory: "/" # Check for updates once a week schedule: - interval: "weekly" + interval: "weekly" + - package-ecosystem: "pip" + directory: "/core" + schedule: + interval: "daily" + - package-ecosystem: "pip" + directory: "/web" + schedule: + interval: "daily" \ No newline at end of file diff --git a/core/Dockerfile b/core/Dockerfile index 291bedc..eee00d2 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -4,6 +4,9 @@ FROM alpine:3.16.2 #Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ +# Add requirements file. +COPY requirements.txt /tmp/ + #Install all required packages, add user for executing mailman and set execution rights for startup script RUN --mount=type=cache,target=/root/.cache \ apk update \ @@ -15,10 +18,9 @@ RUN --mount=type=cache,target=/root/.cache \ && python3 -m pip install -U pip setuptools wheel \ && python3 -m pip install psycopg2 \ gunicorn==19.9.0 \ - mailman==3.3.6 \ - mailman-hyperkitty==1.2.0 \ pymysql \ 'sqlalchemy<1.4.0' \ + -r /tmp/requirements.txt \ && apk del build-deps \ && adduser -S mailman diff --git a/core/requirements.txt b/core/requirements.txt new file mode 100644 index 0000000..82133d8 --- /dev/null +++ b/core/requirements.txt @@ -0,0 +1,5 @@ +# This is a separate file from Dockerfile so that we can use dependabot +# for version updates that isn't supported for contents inside the +# Dockerfile. +mailman==3.3.4 +mailman-hyperkitty==1.1.0 \ No newline at end of file diff --git a/web/Dockerfile b/web/Dockerfile index 49d6acb..0f38953 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -5,6 +5,8 @@ FROM alpine:3.16.2 COPY mailman-web /opt/mailman-web # Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ +# Add requirements file. +COPY requirements.txt /tmp/ # Install packages and dependencies for postorius and hyperkitty Add user for # executing apps, change ownership for uwsgi+django files and set execution @@ -17,10 +19,7 @@ RUN --mount=type=cache,target=/root/.cache \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ - && pip install mailmanclient==3.3.4 \ - postorius==1.3.7 \ - hyperkitty==1.3.6 \ - django-mailman3==1.3.8 \ + && pip install -r /tmp/requirements.txt \ whoosh \ uwsgi \ 'psycopg2<2.9' \ diff --git a/web/requirements.txt b/web/requirements.txt new file mode 100644 index 0000000..20dc945 --- /dev/null +++ b/web/requirements.txt @@ -0,0 +1,4 @@ +mailmanclient==3.3.4 +postorius==1.3.7 +hyperkitty==1.3.6 +django-mailman3==1.3.8 \ No newline at end of file From b6435761d08c9022aa96c0d5e61d770c8c702e9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 08:38:21 +0000 Subject: [PATCH 015/101] Bump mailman-hyperkitty from 1.1.0 to 1.2.0 in /core (#568) Bumps [mailman-hyperkitty](https://gitlab.com/mailman/mailman-hyperkitty) from 1.1.0 to 1.2.0. - [Release notes](https://gitlab.com/mailman/mailman-hyperkitty/tags) - [Commits](https://gitlab.com/mailman/mailman-hyperkitty/compare/v1.1.0...1.2.0) --- updated-dependencies: - dependency-name: mailman-hyperkitty dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/requirements.txt b/core/requirements.txt index 82133d8..c856424 100644 --- a/core/requirements.txt +++ b/core/requirements.txt @@ -2,4 +2,4 @@ # for version updates that isn't supported for contents inside the # Dockerfile. mailman==3.3.4 -mailman-hyperkitty==1.1.0 \ No newline at end of file +mailman-hyperkitty==1.2.0 \ No newline at end of file From b80e60fe54d6d1b6a9dc9c61d96713ee8c9ae9ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Oct 2022 08:46:59 +0000 Subject: [PATCH 016/101] Bump mailman from 3.3.4 to 3.3.6 in /core (#567) Bumps [mailman](https://gitlab.com/mailman/mailman) from 3.3.4 to 3.3.6. - [Release notes](https://gitlab.com/mailman/mailman/tags) - [Commits](https://gitlab.com/mailman/mailman/compare/3.3.4...3.3.6) --- updated-dependencies: - dependency-name: mailman dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/requirements.txt b/core/requirements.txt index c856424..047f5a0 100644 --- a/core/requirements.txt +++ b/core/requirements.txt @@ -1,5 +1,5 @@ # This is a separate file from Dockerfile so that we can use dependabot # for version updates that isn't supported for contents inside the # Dockerfile. -mailman==3.3.4 +mailman==3.3.6 mailman-hyperkitty==1.2.0 \ No newline at end of file From c60f98b52456d4a7fc272ac9762de73875207ad6 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 03:38:37 -0700 Subject: [PATCH 017/101] Use Alpine 3.15 for Python 3.9 needed for Core (#569) --- core/Dockerfile | 3 ++- core/Dockerfile.dev | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index eee00d2..f63d4c7 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -1,5 +1,6 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.16.2 +# Use 3.15 for Core since it has Python 3.9 +FROM alpine:3.15 #Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 186c43e..792b373 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -1,5 +1,6 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.16.2 +# Use 3.15 for Core since it has Python 3.9 +FROM alpine:3.15 #Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ From ba9076a6a0084ddde3a2bbbe62c9a4fc52956a31 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 26 Oct 2022 06:16:56 -0700 Subject: [PATCH 018/101] Create action to mark old PRs (#570) --- .github/workflows/stale.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..97e6741 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,28 @@ +# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time. +# +# You can adjust the behavior by modifying this file. +# For more information, see: +# https://github.com/actions/stale +name: Mark stale issues and pull requests + +on: + schedule: + - cron: '19 22 * * *' + +jobs: + stale: + + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + + steps: + - uses: actions/stale@v5 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + stale-issue-message: 'This issue has not been updated for more than 1year' + stale-pr-message: 'This Pull Request has not been updated for more than 1year' + stale-issue-label: 'no-issue-activity' + stale-pr-label: 'no-pr-activity' + days-before-stale: 365 From 19507087ad112534952074c33bc724ef09a3687b Mon Sep 17 00:00:00 2001 From: bbcchmc <111456727+bbcchmc@users.noreply.github.com> Date: Fri, 28 Oct 2022 07:35:16 -0400 Subject: [PATCH 019/101] Update uwsgi.ini (#555) * Update uwsgi.ini Updated uwsgi from the default to the max setting 65535, this resolves an issue with large http headers that can cause 502 gateway errors when accessing mailman web interface. * Reduce the size from max to what apache2 supports. Co-authored-by: Abhilash Raj --- web/mailman-web/uwsgi.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/mailman-web/uwsgi.ini b/web/mailman-web/uwsgi.ini index 5856f4c..8e917a3 100644 --- a/web/mailman-web/uwsgi.ini +++ b/web/mailman-web/uwsgi.ini @@ -6,6 +6,9 @@ http-socket = 0.0.0.0:8000 #Enable threading for python enable-threads = true +# Setting uwsgi buffer size to what Apache2 supports. +buffer-size = 8190 + # Move to the directory wher the django files are. chdir = /opt/mailman-web From 06f700192e35c3d619cda492040fde42cc2fcbdb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 02:08:54 -0700 Subject: [PATCH 020/101] Bump actions/stale from 5 to 6 (#572) Bumps [actions/stale](https://github.com/actions/stale) from 5 to 6. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 97e6741..67c57c3 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -18,7 +18,7 @@ jobs: pull-requests: write steps: - - uses: actions/stale@v5 + - uses: actions/stale@v6 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'This issue has not been updated for more than 1year' From c48d96054c82035eebe4a1a2fe100faf049ca016 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Mon, 31 Oct 2022 02:21:04 -0700 Subject: [PATCH 021/101] Use Django 4.0.x for now. (#573) * Use Django 4.0.x for now. * Use django 4.0.x for now --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 0f38953..dc43fb6 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ - && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ + && python3 -m pip install -U 'Django<4.1' pip setuptools wheel \ && pip install -r /tmp/requirements.txt \ whoosh \ uwsgi \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 8a1f466..a87893b 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -37,7 +37,7 @@ RUN --mount=type=cache,target=/root/.cache \ tzdata \ diskcache \ django-utils-six \ - && python3 -m pip install -U 'Django<4.2' \ + && python3 -m pip install -U 'Django<4.1' \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ From 0100dc4bc01946760bd38523305cdf6196a4dd76 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sat, 5 Nov 2022 07:38:55 -0700 Subject: [PATCH 022/101] Add g++ (gcc-cpp) as build dependency (#575) * Add gcc-cpp as build dependency * add g++ * add pg binary driver * Use the postgresql as the driver scheme * Revert "add pg binary driver" This reverts commit aaa3aed87e40a0f6193ba1242934fd7659a75440. --- core/Dockerfile.dev | 5 +++-- docker-compose.yaml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 792b373..9c58bf3 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -15,8 +15,9 @@ ARG MM3_HK_REF RUN --mount=type=cache,target=/root/.cache \ apk update \ && apk add --no-cache --virtual build-deps gcc python3-dev musl-dev \ - postgresql-dev git libffi-dev \ - && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c \ + postgresql-dev git libffi-dev g++ \ + && apk add --no-cache bash su-exec postgresql-client mysql-client \ + curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c \ && python3 -m pip install -U psycopg2 pymysql setuptools wheel \ && python3 -m pip install \ git+https://gitlab.com/mailman/mailman \ diff --git a/docker-compose.yaml b/docker-compose.yaml index ecc7ec9..edb0290 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -13,7 +13,7 @@ services: depends_on: - database environment: - - DATABASE_URL=postgres://mailman:mailmanpass@database/mailmandb + - DATABASE_URL=postgresql://mailman:mailmanpass@database/mailmandb - DATABASE_TYPE=postgres - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase - HYPERKITTY_API_KEY=someapikey @@ -36,7 +36,7 @@ services: - /opt/mailman/web:/opt/mailman-web-data environment: - DATABASE_TYPE=postgres - - DATABASE_URL=postgres://mailman:mailmanpass@database/mailmandb + - DATABASE_URL=postgresql://mailman:mailmanpass@database/mailmandb - HYPERKITTY_API_KEY=someapikey ports: - "127.0.0.1:8000:8000" # HTTP From b4b11686b1ba39baf77c0ec4adbb24b2d54b9901 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 14 Dec 2022 21:09:42 -0800 Subject: [PATCH 023/101] Drop dependency on SQLAlchemy < 1.4 (#585) --- core/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/core/Dockerfile b/core/Dockerfile index f63d4c7..99b693f 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -20,7 +20,6 @@ RUN --mount=type=cache,target=/root/.cache \ && python3 -m pip install psycopg2 \ gunicorn==19.9.0 \ pymysql \ - 'sqlalchemy<1.4.0' \ -r /tmp/requirements.txt \ && apk del build-deps \ && adduser -S mailman From 81a16de5f53cd2d7cc1d9fb2ffd96f9f59108ef1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 21:13:20 -0800 Subject: [PATCH 024/101] Bump alpine from 3.16.2 to 3.17.0 in /web (#584) Bumps alpine from 3.16.2 to 3.17.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index dc43fb6..23d02c3 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.16.2 +FROM alpine:3.17.0 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index a87893b..81b05ca 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.16.2 +FROM alpine:3.17.0 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From 8b289ac1523f77da6fa3b183a290dfa00d7ae6f4 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 14 Dec 2022 21:13:55 -0800 Subject: [PATCH 025/101] Update mailman-web/urls.py address regex behavior in new django (#580) Regexes are not allowed in path() objects with newer django. This syncs up with the upstream urls.py at: https://gitlab.com/mailman/mailman-web/-/blob/master/mailman_web/urls.py But does not modify the postorious/ vs mailman3/ and hyperkitty/ vs archives/ paths. --- web/mailman-web/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/mailman-web/urls.py b/web/mailman-web/urls.py index 0e14f66..19d49f9 100644 --- a/web/mailman-web/urls.py +++ b/web/mailman-web/urls.py @@ -22,7 +22,7 @@ from django.urls import path, reverse_lazy from django.views.generic import RedirectView urlpatterns = [ - path(r'^$', RedirectView.as_view( + path(r'', RedirectView.as_view( url=reverse_lazy('list_index'), permanent=True)), path(r'postorius/', include('postorius.urls')), @@ -30,5 +30,5 @@ urlpatterns = [ path(r'', include('django_mailman3.urls')), path(r'accounts/', include('allauth.urls')), # Django admin - path(r'^admin/', admin.site.urls), + path(r'admin/', admin.site.urls), ] From b4c19521ad0851dd7bb9cc562a4b7c5bcc1a1450 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 21:21:03 -0800 Subject: [PATCH 026/101] Bump alpine from 3.16.2 to 3.17.0 in /postorius (#583) Bumps alpine from 3.16.2 to 3.17.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index c678763..708659f 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.16.2 +FROM alpine:3.17.0 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index bedac05..6ff30eb 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.16.2 +FROM alpine:3.17.0 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From edbd2946793f3c6273a8414394cbe8ccbb50fc8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 21:55:13 -0800 Subject: [PATCH 027/101] Bump mailman from 3.3.6 to 3.3.7 in /core (#577) Bumps [mailman](https://gitlab.com/mailman/mailman) from 3.3.6 to 3.3.7. - [Release notes](https://gitlab.com/mailman/mailman/tags) - [Commits](https://gitlab.com/mailman/mailman/compare/3.3.6...3.3.7) --- updated-dependencies: - dependency-name: mailman dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Abhilash Raj --- core/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/requirements.txt b/core/requirements.txt index 047f5a0..79bc76d 100644 --- a/core/requirements.txt +++ b/core/requirements.txt @@ -1,5 +1,5 @@ # This is a separate file from Dockerfile so that we can use dependabot # for version updates that isn't supported for contents inside the # Dockerfile. -mailman==3.3.6 +mailman==3.3.7 mailman-hyperkitty==1.2.0 \ No newline at end of file From ce99841a6fe6f1ae5f2ecc7e9164f772bd899ede Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 19:54:15 -0800 Subject: [PATCH 028/101] Bump actions/stale from 6 to 7 (#586) Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 67c57c3..411229c 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -18,7 +18,7 @@ jobs: pull-requests: write steps: - - uses: actions/stale@v6 + - uses: actions/stale@v7 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'This issue has not been updated for more than 1year' From 14a5b17741905553e67026915b5f9b7815261617 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Jan 2023 19:54:37 -0800 Subject: [PATCH 029/101] Bump alpine from 3.15 to 3.17 in /core (#582) Bumps alpine from 3.15 to 3.17. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/Dockerfile | 2 +- core/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index 99b693f..f641f20 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.3 # Use 3.15 for Core since it has Python 3.9 -FROM alpine:3.15 +FROM alpine:3.17 #Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 9c58bf3..6bbac97 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.3 # Use 3.15 for Core since it has Python 3.9 -FROM alpine:3.15 +FROM alpine:3.17 #Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ From 0c9b0179c57b4a49f0897cc245760d7bc6f9e4d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 05:04:22 -0800 Subject: [PATCH 030/101] Bump mailman from 3.3.7 to 3.3.8 in /core (#592) Bumps [mailman](https://gitlab.com/mailman/mailman) from 3.3.7 to 3.3.8. - [Release notes](https://gitlab.com/mailman/mailman/tags) - [Commits](https://gitlab.com/mailman/mailman/compare/3.3.7...3.3.8) --- updated-dependencies: - dependency-name: mailman dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/requirements.txt b/core/requirements.txt index 79bc76d..ab32443 100644 --- a/core/requirements.txt +++ b/core/requirements.txt @@ -1,5 +1,5 @@ # This is a separate file from Dockerfile so that we can use dependabot # for version updates that isn't supported for contents inside the # Dockerfile. -mailman==3.3.7 +mailman==3.3.8 mailman-hyperkitty==1.2.0 \ No newline at end of file From f9cdab4b3eb9a231ec8aa6b1c96742490b6eacdf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 05:04:43 -0800 Subject: [PATCH 031/101] Bump hyperkitty from 1.3.6 to 1.3.7 in /web (#590) Bumps [hyperkitty](https://gitlab.com/mailman/hyperkitty) from 1.3.6 to 1.3.7. - [Release notes](https://gitlab.com/mailman/hyperkitty/tags) - [Commits](https://gitlab.com/mailman/hyperkitty/compare/v1.3.6...1.3.7) --- updated-dependencies: - dependency-name: hyperkitty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/requirements.txt b/web/requirements.txt index 20dc945..eec95aa 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,4 +1,4 @@ mailmanclient==3.3.4 postorius==1.3.7 -hyperkitty==1.3.6 +hyperkitty==1.3.7 django-mailman3==1.3.8 \ No newline at end of file From 55c8a71cbdbff3e7d1e787f3f05198515a048d59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 05:05:13 -0800 Subject: [PATCH 032/101] Bump mailmanclient from 3.3.4 to 3.3.5 in /web (#587) Bumps [mailmanclient](https://gitlab.com/mailman/mailmanclient) from 3.3.4 to 3.3.5. - [Release notes](https://gitlab.com/mailman/mailmanclient/tags) - [Commits](https://gitlab.com/mailman/mailmanclient/compare/3.3.4...3.3.5) --- updated-dependencies: - dependency-name: mailmanclient dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/requirements.txt b/web/requirements.txt index eec95aa..dfe67ae 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,4 +1,4 @@ -mailmanclient==3.3.4 +mailmanclient==3.3.5 postorius==1.3.7 hyperkitty==1.3.7 django-mailman3==1.3.8 \ No newline at end of file From ad9b2ce75f7e7a135a6e0d3abce3dba0360df273 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 18:41:47 +0530 Subject: [PATCH 033/101] Bump mailman-hyperkitty from 1.2.0 to 1.2.1 in /core (#591) Bumps [mailman-hyperkitty](https://gitlab.com/mailman/mailman-hyperkitty) from 1.2.0 to 1.2.1. - [Release notes](https://gitlab.com/mailman/mailman-hyperkitty/tags) - [Commits](https://gitlab.com/mailman/mailman-hyperkitty/compare/1.2.0...1.2.1) --- updated-dependencies: - dependency-name: mailman-hyperkitty dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/requirements.txt b/core/requirements.txt index ab32443..48d2917 100644 --- a/core/requirements.txt +++ b/core/requirements.txt @@ -2,4 +2,4 @@ # for version updates that isn't supported for contents inside the # Dockerfile. mailman==3.3.8 -mailman-hyperkitty==1.2.0 \ No newline at end of file +mailman-hyperkitty==1.2.1 \ No newline at end of file From 8210125788b0e94e3b1b15c78014c1f8ebb4ea07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 13:12:24 +0000 Subject: [PATCH 034/101] Bump postorius from 1.3.7 to 1.3.8 in /web (#589) Bumps [postorius](https://gitlab.com/mailman/postorius) from 1.3.7 to 1.3.8. - [Release notes](https://gitlab.com/mailman/postorius/tags) - [Commits](https://gitlab.com/mailman/postorius/compare/1.3.7...1.3.8) --- updated-dependencies: - dependency-name: postorius dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/requirements.txt b/web/requirements.txt index dfe67ae..11d5571 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,4 +1,4 @@ mailmanclient==3.3.5 -postorius==1.3.7 +postorius==1.3.8 hyperkitty==1.3.7 django-mailman3==1.3.8 \ No newline at end of file From 49fa5c7fa703207997aa24ca9da77a90cad64c7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jan 2023 13:12:50 +0000 Subject: [PATCH 035/101] Bump django-mailman3 from 1.3.8 to 1.3.9 in /web (#588) Bumps [django-mailman3](https://gitlab.com/mailman/django-mailman3) from 1.3.8 to 1.3.9. - [Release notes](https://gitlab.com/mailman/django-mailman3/tags) - [Commits](https://gitlab.com/mailman/django-mailman3/compare/v1.3.8...1.3.9) --- updated-dependencies: - dependency-name: django-mailman3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/requirements.txt b/web/requirements.txt index 11d5571..61f85e2 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,4 +1,4 @@ mailmanclient==3.3.5 postorius==1.3.8 hyperkitty==1.3.7 -django-mailman3==1.3.8 \ No newline at end of file +django-mailman3==1.3.9 \ No newline at end of file From cb5616986f67ce786065bc1a152f320f9a0b268d Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Fri, 6 Jan 2023 09:25:15 +0530 Subject: [PATCH 036/101] Skip publishing to quay.io (#594) --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index d67df98..c1ff4df 100644 --- a/README.md +++ b/README.md @@ -60,19 +60,16 @@ The container images are available from multiple container registries: ### Mailman Core - `ghcr.io/maxking/mailman-core` -- `quay.io/maxking/mailman-core` - `docker.io/maxking/mailman-core` ### Mailman Web - `ghcr.io/maxking/mailman-web` -- `quay.io/maxking/mailman-web` - `docker.io/maxking/mailman-web` ### Postorius - `ghcr.io/maxking/postorius` -- `quay.io/maxking/postorius` - `docker.io/maxking/postorius` ## Rolling Releases From df02cb7cbeb3dd06c954002982c3fa1dc0f15311 Mon Sep 17 00:00:00 2001 From: joergmschulz Date: Sat, 14 Jan 2023 03:10:40 +0100 Subject: [PATCH 037/101] Add SMTP_USER, SMTP_PASSWORD from environment vars. (#599) * add smtp user, password from environment add smtp user, password from environment to mailman.cfg * Update README.md document SMTP authentication via docker-compose.yml * Update README.md * Create docker-compose-traefik.yml real life example * remove examples folder for later use --- README.md | 4 ++++ core/docker-entrypoint.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/README.md b/README.md index c1ff4df..6378993 100644 --- a/README.md +++ b/README.md @@ -211,6 +211,10 @@ These are the variables that you MUST change in your docker-compose.yaml before - `DATABASE_CLASS`: Default value is `mailman.database.sqlite.SQLiteDatabase`. The values for this can be found in the mailman's documentation [here][11]. +- `SMTP_HOST` : outgoing host for SMTP connections +- `SMTP_PORT` : use this port. 25, 587, whatever your host asks for. +- `SMTP_HOST_USER`: authenticate this user +- `SMTP_HOST_PASSWORD`: and use this password For more details on how to configure this image, please look [Mailman-core's Readme](core/) diff --git a/core/docker-entrypoint.sh b/core/docker-entrypoint.sh index 80aa6c7..21f700c 100755 --- a/core/docker-entrypoint.sh +++ b/core/docker-entrypoint.sh @@ -142,6 +142,8 @@ lmtp_host: $MM_HOSTNAME lmtp_port: 8024 smtp_host: $SMTP_HOST smtp_port: $SMTP_PORT +smtp_user: $SMTP_HOST_USER +smtp_pass: $SMTP_HOST_PASSWORD configuration: python:mailman.config.exim4 EOF @@ -163,6 +165,8 @@ lmtp_host: $MM_HOSTNAME lmtp_port: 8024 smtp_host: $SMTP_HOST smtp_port: $SMTP_PORT +smtp_user: $SMTP_HOST_USER +smtp_pass: $SMTP_HOST_PASSWORD configuration: /etc/postfix-mailman.cfg EOF From 9606f2f1908d438da7ffa6d75aa2776e5cf7f811 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 22:17:16 -0800 Subject: [PATCH 038/101] Bump alpine from 3.17.0 to 3.17.1 in /web (#600) Bumps alpine from 3.17.0 to 3.17.1. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 23d02c3..e6a863f 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.0 +FROM alpine:3.17.1 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 81b05ca..28ff44e 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.0 +FROM alpine:3.17.1 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From b7d5fa3a187763e6a68df00ab161ff5b34616961 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 22:17:31 -0800 Subject: [PATCH 039/101] Bump alpine from 3.17.0 to 3.17.1 in /postorius (#601) Bumps alpine from 3.17.0 to 3.17.1. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 708659f..fbb4404 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.0 +FROM alpine:3.17.1 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 6ff30eb..8e69587 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.0 +FROM alpine:3.17.1 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From ebd64f9c025ab1926272bea01ca9c691b6f9cc04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 05:12:48 -0800 Subject: [PATCH 040/101] Bump alpine from 3.17.1 to 3.17.2 in /web (#606) Bumps alpine from 3.17.1 to 3.17.2. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index e6a863f..4b411a0 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.1 +FROM alpine:3.17.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 28ff44e..bb76766 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.1 +FROM alpine:3.17.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From a46e3c936905407a7ca4f3046b819cdf8ab85f75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 05:13:00 -0800 Subject: [PATCH 041/101] Bump alpine from 3.17.1 to 3.17.2 in /postorius (#607) Bumps alpine from 3.17.1 to 3.17.2. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index fbb4404..a90b839 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.1 +FROM alpine:3.17.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 8e69587..10b786f 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.1 +FROM alpine:3.17.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From eef13c7f011ea2cabbe7e2d4b7c3074a351b3be3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 07:41:43 +0530 Subject: [PATCH 042/101] Bump alpine from 3.17.2 to 3.17.3 in /postorius (#612) Bumps alpine from 3.17.2 to 3.17.3. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index a90b839..f698050 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.2 +FROM alpine:3.17.3 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 10b786f..d79f477 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.2 +FROM alpine:3.17.3 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From c0ac2af9ba8d4d65efd9708c6b1d375ca3687c2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 07:41:54 +0530 Subject: [PATCH 043/101] Bump actions/stale from 7 to 8 (#611) Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v7...v8) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 411229c..b44f574 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -18,7 +18,7 @@ jobs: pull-requests: write steps: - - uses: actions/stale@v7 + - uses: actions/stale@v8 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'This issue has not been updated for more than 1year' From b581310090e6aac1f201066f187fa9da5cb17b6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Apr 2023 07:42:04 +0530 Subject: [PATCH 044/101] Bump alpine from 3.17.2 to 3.17.3 in /web (#613) Bumps alpine from 3.17.2 to 3.17.3. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 4b411a0..1cde21f 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.2 +FROM alpine:3.17.3 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index bb76766..adcedde 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.2 +FROM alpine:3.17.3 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From a5601ea8ee59395972bb769a3d4185ab10821237 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 08:00:25 +0000 Subject: [PATCH 045/101] Bump alpine from 3.17.3 to 3.18.0 in /web Bumps alpine from 3.17.3 to 3.18.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... 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 1cde21f..44875b5 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.3 +FROM alpine:3.18.0 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index adcedde..c621c5a 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.3 +FROM alpine:3.18.0 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From 33be7724ce0e019936a9c6f90f8bfcebfb61f071 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 02:24:57 -0700 Subject: [PATCH 046/101] Bump alpine from 3.17.3 to 3.18.0 in /postorius (#620) Bumps alpine from 3.17.3 to 3.18.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index f698050..d44a78c 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.3 +FROM alpine:3.18.0 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index d79f477..815e706 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.17.3 +FROM alpine:3.18.0 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From 8a733985327735dc7050aa1ab7753910254d8916 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 02:25:10 -0700 Subject: [PATCH 047/101] Bump alpine from 3.17 to 3.18 in /core (#618) Bumps alpine from 3.17 to 3.18. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- core/Dockerfile | 2 +- core/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index f641f20..c917d15 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.3 # Use 3.15 for Core since it has Python 3.9 -FROM alpine:3.17 +FROM alpine:3.18 #Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 6bbac97..4dfdaaf 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.3 # Use 3.15 for Core since it has Python 3.9 -FROM alpine:3.17 +FROM alpine:3.18 #Add startup script to container COPY docker-entrypoint.sh /usr/local/bin/ From 95643047060448176d96b606a439658c46976eff Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Fri, 16 Jun 2023 07:58:02 +0000 Subject: [PATCH 048/101] Bump version of Django to 4.1.x --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 44875b5..c3b74de 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ - && python3 -m pip install -U 'Django<4.1' pip setuptools wheel \ + && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ && pip install -r /tmp/requirements.txt \ whoosh \ uwsgi \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index c621c5a..b7d8a6e 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -37,7 +37,7 @@ RUN --mount=type=cache,target=/root/.cache \ tzdata \ diskcache \ django-utils-six \ - && python3 -m pip install -U 'Django<4.1' \ + && python3 -m pip install -U 'Django<4.2' \ && python3 -m pip install -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ From 91a0e999ccfcd643720d6af51136086f09fa71c5 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Fri, 16 Jun 2023 08:05:31 +0000 Subject: [PATCH 049/101] Also bump version of psycopg2 --- web/Dockerfile | 1 - web/Dockerfile.dev | 1 - 2 files changed, 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index c3b74de..9703b3c 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -22,7 +22,6 @@ RUN --mount=type=cache,target=/root/.cache \ && pip install -r /tmp/requirements.txt \ whoosh \ uwsgi \ - 'psycopg2<2.9' \ dj-database-url \ mysqlclient \ typing \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index b7d8a6e..31f8774 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -28,7 +28,6 @@ RUN --mount=type=cache,target=/root/.cache \ git+https://gitlab.com/mailman/hyperkitty \ whoosh \ uwsgi \ - 'psycopg2<2.9' \ dj-database-url \ mysqlclient \ xapian-haystack \ From 85a060015c2c63b940be789b190cc711f49cbdbf Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Fri, 16 Jun 2023 08:21:24 +0000 Subject: [PATCH 050/101] Do it correctly this time --- web/Dockerfile | 1 + web/Dockerfile.dev | 1 + 2 files changed, 2 insertions(+) diff --git a/web/Dockerfile b/web/Dockerfile index 9703b3c..fed84a3 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -22,6 +22,7 @@ RUN --mount=type=cache,target=/root/.cache \ && pip install -r /tmp/requirements.txt \ whoosh \ uwsgi \ + psycopg2 \ dj-database-url \ mysqlclient \ typing \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 31f8774..978ab0f 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -28,6 +28,7 @@ RUN --mount=type=cache,target=/root/.cache \ git+https://gitlab.com/mailman/hyperkitty \ whoosh \ uwsgi \ + psycopg2 \ dj-database-url \ mysqlclient \ xapian-haystack \ From 4e184096a755d6ef8358ef010461abfd78147d1e Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 18 Jun 2023 23:30:05 +0200 Subject: [PATCH 051/101] Highlight diverging database URLs in `docker-compose-mysql.yaml` --- docker-compose-mysql.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-compose-mysql.yaml b/docker-compose-mysql.yaml index 5d8358e..bc739b7 100644 --- a/docker-compose-mysql.yaml +++ b/docker-compose-mysql.yaml @@ -13,9 +13,8 @@ services: depends_on: - database environment: - - DATABASE_URL=mysql+pymysql://mailman:mailmanpass@database/mailmandb?charset=utf8mb4&use_unicode=1 + - DATABASE_URL=mysql+pymysql://mailman:mailmanpass@database/mailmandb?charset=utf8mb4&use_unicode=1 # Do use mysql+pymysql:// here - DATABASE_TYPE=mysql - - DATABASE_CLASS=mailman.database.mysql.MySQLDatabase - HYPERKITTY_API_KEY=someapikey ports: - "127.0.0.1:8001:8001" # API @@ -36,7 +35,7 @@ services: - /opt/mailman/web:/opt/mailman-web-data environment: - DATABASE_TYPE=mysql - - DATABASE_URL=mysql://mailman:mailmanpass@database/mailmandb?charset=utf8mb4 + - DATABASE_URL=mysql://mailman:mailmanpass@database/mailmandb?charset=utf8mb4 # Do use mysql:// here - HYPERKITTY_API_KEY=someapikey - SECRET_KEY=thisisaverysecretkey - DYLD_LIBRARY_PATH=/usr/local/mysql/lib/ @@ -66,4 +65,4 @@ networks: driver: default config: - - subnet: 172.19.199.0/24 \ No newline at end of file + subnet: 172.19.199.0/24 From ca033c1a583cf79de4d3a973cc86356a17c0b6da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 07:59:38 +0000 Subject: [PATCH 052/101] Bump alpine from 3.18.0 to 3.18.2 in /postorius Bumps alpine from 3.18.0 to 3.18.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 d44a78c..36d52fc 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.0 +FROM alpine:3.18.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 815e706..6ab02d5 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.0 +FROM alpine:3.18.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From 4e7f032621f0578b79a67b319ceef12307a31e4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 07:59:47 +0000 Subject: [PATCH 053/101] Bump alpine from 3.18.0 to 3.18.2 in /web Bumps alpine from 3.18.0 to 3.18.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 fed84a3..e4400e4 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.0 +FROM alpine:3.18.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 978ab0f..25707b5 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.0 +FROM alpine:3.18.2 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From c097913a8050400b8b2b79ab1f95c5c4ee5daa99 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 19 Jun 2023 11:26:05 +0200 Subject: [PATCH 054/101] Use `TZ` in `settings.py` --- web/mailman-web/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index 6c2d0d0..e58e9b1 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -178,7 +178,7 @@ AUTH_PASSWORD_VALIDATORS = [ LANGUAGE_CODE = 'en-us' -TIME_ZONE = 'UTC' +TIME_ZONE = os.environ.get('TZ', 'UTC') USE_I18N = True From 5ec446a9274d974d69d91ddcb35872898e0d03b8 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 19 Jun 2023 11:33:51 +0200 Subject: [PATCH 055/101] `apk add tzdata` --- core/Dockerfile | 2 +- core/Dockerfile.dev | 2 +- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index c917d15..0abe1db 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/root/.cache \ libffi-dev \ # Mailman html to plaintext conversion uses lynx. # psutil needs linux-headers to compile on musl c library. - && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c lynx \ + && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c lynx tzdata \ && python3 -m pip install -U pip setuptools wheel \ && python3 -m pip install psycopg2 \ gunicorn==19.9.0 \ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 4dfdaaf..8915b43 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual build-deps gcc python3-dev musl-dev \ postgresql-dev git libffi-dev g++ \ && apk add --no-cache bash su-exec postgresql-client mysql-client \ - curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c \ + curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c tzdata \ && python3 -m pip install -U psycopg2 pymysql setuptools wheel \ && python3 -m pip install \ git+https://gitlab.com/mailman/mailman \ diff --git a/postorius/Dockerfile b/postorius/Dockerfile index d44a78c..1d75e60 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -13,7 +13,7 @@ RUN --mount=type=cache,target=/root/.cache \ set -ex \ && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev openldap-dev cargo rust \ - && apk add --no-cache --virtual .mailman-rundeps bash sassc \ + && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip libffi libuuid pcre-dev py-cryptography \ && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 815e706..665eaab 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -17,7 +17,7 @@ RUN --mount=type=cache,target=/root/.cache \ set -ex \ && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev git cargo rust \ - && apk add --no-cache --virtual .mailman-rundeps bash sassc \ + && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap \ python3 py3-pip libffi gettext py-cryptography \ && python3 -m pip install -U pip setuptools wheel \ diff --git a/web/Dockerfile b/web/Dockerfile index fed84a3..d820377 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/root/.cache \ set -ex \ && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev openldap-dev cargo rust \ - && apk add --no-cache --virtual .mailman-rundeps bash sassc \ + && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 978ab0f..af03e87 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -18,7 +18,7 @@ RUN --mount=type=cache,target=/root/.cache \ set -ex \ && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers git \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev openldap-dev cargo rust \ - && apk add --no-cache --virtual .mailman-rundeps bash sassc pcre-dev \ + && apk add --no-cache --virtual .mailman-rundeps bash sassc pcre-dev tzdata \ python3 py3-pip postgresql-client mysql-client py3-mysqlclient \ curl mailcap xapian-core xapian-bindings-python3 libffi gettext py-cryptography \ && python3 -m pip install -U pip setuptools wheel \ From 1a390c02602829b86d560475f1aab730a9cec5f5 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 19 Jun 2023 11:40:25 +0200 Subject: [PATCH 056/101] Version tag comment --- docker-compose-mysql.yaml | 4 ++-- docker-compose-postorius.yaml | 6 +++--- docker-compose.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose-mysql.yaml b/docker-compose-mysql.yaml index bc739b7..269cd72 100644 --- a/docker-compose-mysql.yaml +++ b/docker-compose-mysql.yaml @@ -2,7 +2,7 @@ version: '2' services: mailman-core: - image: maxking/mailman-core:0.4 + image: maxking/mailman-core:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-core hostname: mailman-core volumes: @@ -23,7 +23,7 @@ services: mailman: mailman-web: - image: maxking/mailman-web:0.4 + image: maxking/mailman-web:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-web hostname: mailman-web depends_on: diff --git a/docker-compose-postorius.yaml b/docker-compose-postorius.yaml index 64f0af2..3bcfff7 100644 --- a/docker-compose-postorius.yaml +++ b/docker-compose-postorius.yaml @@ -2,7 +2,7 @@ version: '2' services: mailman-core: - image: maxking/mailman-core:0.4 + image: maxking/mailman-core:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-core hostname: mailman-core volumes: @@ -23,7 +23,7 @@ services: mailman: mailman-web: - image: maxking/postorius:0.4 + image: maxking/postorius:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-web hostname: mailman-web depends_on: @@ -63,4 +63,4 @@ networks: driver: default config: - - subnet: 172.19.199.0/24 \ No newline at end of file + subnet: 172.19.199.0/24 diff --git a/docker-compose.yaml b/docker-compose.yaml index edb0290..58d1d78 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,7 +2,7 @@ version: '2' services: mailman-core: - image: maxking/mailman-core:0.4 + image: maxking/mailman-core:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-core hostname: mailman-core volumes: @@ -24,7 +24,7 @@ services: mailman: mailman-web: - image: maxking/mailman-web:0.4 + image: maxking/mailman-web:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-web hostname: mailman-web depends_on: From 0647e9c8eb00298a122196e80675181f73a46715 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 19 Jun 2023 11:44:43 +0200 Subject: [PATCH 057/101] EMAIL_USE_TLS/EMAIL_USE_SSL are mutually exclusive, so only set one of those settings. --- web/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/README.md b/web/README.md index 3bedcbb..6e3b3fe 100644 --- a/web/README.md +++ b/web/README.md @@ -56,10 +56,10 @@ change them unless you know what you want. - `SMTP_HOST_PASSWORD`: Default is an empty string. - `SMTP_USE_TLS`: Specifies wheather the SMTP connection is encrypted - via TLS. Default is `False`. + via TLS. Default is `False`. (EMAIL_USE_TLS/EMAIL_USE_SSL are mutually exclusive, so only set one of those settings.) - `SMTP_USE_SSL`: Specifies wheather the SMTP connection is encrypted - via SSL. Default is `False`. + via SSL. Default is `False`. (EMAIL_USE_TLS/EMAIL_USE_SSL are mutually exclusive, so only set one of those settings.) - `DJANGO_LOG_URL`: Path to the django's log file. Defaults to `/opt/mailman-web-data/logs/mailmanweb.log`. From 9c84b4030a051d462f5360e96b525ed7aa1891a3 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 19 Jun 2023 18:59:41 +0200 Subject: [PATCH 058/101] Version tag comment in Readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 6378993..9e771b8 100644 --- a/README.md +++ b/README.md @@ -54,8 +54,7 @@ Releases will follow the following rules: ## Container Registries - -The container images are available from multiple container registries: +The container images are available from multiple container registries. Do specify an [explicit version tag](https://hub.docker.com/r/maxking/mailman-web/tags?page=1&ordering=last_updated&name=0.) (e.g. `0.4`) as tag `latest` is **not** updated anymore. ### Mailman Core From 4dcba2362a56ebd5bab7519b42996684164cedea Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Mon, 19 Jun 2023 19:52:23 -0700 Subject: [PATCH 059/101] Added minor suggestions. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9e771b8..c5988de 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ Releases will follow the following rules: ## Container Registries -The container images are available from multiple container registries. Do specify an [explicit version tag](https://hub.docker.com/r/maxking/mailman-web/tags?page=1&ordering=last_updated&name=0.) (e.g. `0.4`) as tag `latest` is **not** updated anymore. +The container images are available from multiple container registries. Do specify an [explicit version tag](https://hub.docker.com/r/maxking/mailman-web/tags?page=1&ordering=last_updated&name=0.) (e.g. `0.4.5` , MAJOR.MINOR like `0.4` also works as floating tag pointing to latest patch version) as tag `latest` is **not** updated anymore. ### Mailman Core From f3b1ac922f515aa2d71824a2987d95f5ba583b10 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Mon, 19 Jun 2023 19:54:13 -0700 Subject: [PATCH 060/101] nit: Use backticks for variables. --- web/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/README.md b/web/README.md index 6e3b3fe..a912ba6 100644 --- a/web/README.md +++ b/web/README.md @@ -56,7 +56,7 @@ change them unless you know what you want. - `SMTP_HOST_PASSWORD`: Default is an empty string. - `SMTP_USE_TLS`: Specifies wheather the SMTP connection is encrypted - via TLS. Default is `False`. (EMAIL_USE_TLS/EMAIL_USE_SSL are mutually exclusive, so only set one of those settings.) + via TLS. Default is `False`. (`EMAIL_USE_TLS`/`EMAIL_USE_SSL` are mutually exclusive, so only set one of those settings.) - `SMTP_USE_SSL`: Specifies wheather the SMTP connection is encrypted via SSL. Default is `False`. (EMAIL_USE_TLS/EMAIL_USE_SSL are mutually exclusive, so only set one of those settings.) From 244b73d0f23407ef3f148025f96b90e7731106b3 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Mon, 19 Jun 2023 20:04:03 -0700 Subject: [PATCH 061/101] fix: Use -P pager=off in the psql commands. (#631) This allows for non-interactive use and doesn't hang on the user input in certain conditions, like when the command output is large. Fixes #610 --- core/docker-entrypoint.sh | 2 +- postorius/docker-entrypoint.sh | 2 +- web/docker-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/docker-entrypoint.sh b/core/docker-entrypoint.sh index 21f700c..254df08 100755 --- a/core/docker-entrypoint.sh +++ b/core/docker-entrypoint.sh @@ -6,7 +6,7 @@ function wait_for_postgres () { # moving forward. # TODO: Use python3's psycopg2 module to do this in python3 instead of # installing postgres-client in the image. - until psql $DATABASE_URL -c '\l'; do + until psql -P pager=off $DATABASE_URL -c '\l'; do >&2 echo "Postgres is unavailable - sleeping" sleep 1 done diff --git a/postorius/docker-entrypoint.sh b/postorius/docker-entrypoint.sh index 2b8218b..ec51cbb 100755 --- a/postorius/docker-entrypoint.sh +++ b/postorius/docker-entrypoint.sh @@ -7,7 +7,7 @@ function wait_for_postgres () { # moving forward. # TODO: Use python's psycopg2 module to do this in python instead of # installing postgres-client in the image. - until psql $DATABASE_URL -c '\l'; do + until psql -P pager=off $DATABASE_URL -c '\l'; do >&2 echo "Postgres is unavailable - sleeping" sleep 1 done diff --git a/web/docker-entrypoint.sh b/web/docker-entrypoint.sh index a29c396..09124c9 100755 --- a/web/docker-entrypoint.sh +++ b/web/docker-entrypoint.sh @@ -7,7 +7,7 @@ function wait_for_postgres () { # moving forward. # TODO: Use python's psycopg2 module to do this in python instead of # installing postgres-client in the image. - until psql $DATABASE_URL -c '\l'; do + until psql -P pager=off $DATABASE_URL -c '\l'; do >&2 echo "Postgres is unavailable - sleeping" sleep 1 done From 57a2f5456a976229e7dc397d897e996fdda4050d Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 26 Jun 2023 12:47:10 +0200 Subject: [PATCH 062/101] Fix `DJANGO_ALLOWED_HOSTS` parsing Closes #637. --- postorius/mailman-web/settings.py | 6 ++---- web/README.md | 2 +- web/mailman-web/settings.py | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/postorius/mailman-web/settings.py b/postorius/mailman-web/settings.py index d701c4e..ee51ac0 100644 --- a/postorius/mailman-web/settings.py +++ b/postorius/mailman-web/settings.py @@ -46,16 +46,14 @@ ADMINS = ( SITE_ID = 1 # Hosts/domain names that are valid for this site; required if DEBUG is False -# See https://docs.djangoproject.com/en/1.8/ref/settings/#allowed-hosts +# See https://docs.djangoproject.com/en/3.1/ref/settings/#allowed-hosts ALLOWED_HOSTS = [ "localhost", # Archiving API from Mailman, keep it. - # "lists.your-domain.org", - # Add here all production URLs you may have. "mailman-web", gethostbyname("mailman-web"), os.environ.get('SERVE_FROM_DOMAIN'), - os.environ.get('DJANGO_ALLOWED_HOSTS'), ] +ALLOWED_HOSTS.extend(os.getenv("DJANGO_ALLOWED_HOSTS", "").split(",")) # Mailman API credentials MAILMAN_REST_API_URL = os.environ.get('MAILMAN_REST_URL', 'http://mailman-core:8001') diff --git a/web/README.md b/web/README.md index a912ba6..c1116cf 100644 --- a/web/README.md +++ b/web/README.md @@ -65,7 +65,7 @@ change them unless you know what you want. `/opt/mailman-web-data/logs/mailmanweb.log`. - `DJANGO_ALLOWED_HOSTS`: Entry to add to ALLOWED_HOSTS in Django - configuration. This is a separate configuration from`SERVE_FROM_DOMAIN` as + configuration. Format as comma-separated list (no whitespace). This is a separate configuration from`SERVE_FROM_DOMAIN` as latter is used for other purposes too. - `POSTORIUS_TEMPLATE_BASE_URL`: The base url at which the `mailman-web` diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index e58e9b1..ae03653 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -49,13 +49,11 @@ SITE_ID = 1 # See https://docs.djangoproject.com/en/3.1/ref/settings/#allowed-hosts ALLOWED_HOSTS = [ "localhost", # Archiving API from Mailman, keep it. - # "lists.your-domain.org", - # Add here all production URLs you may have. "mailman-web", gethostbyname("mailman-web"), os.environ.get('SERVE_FROM_DOMAIN'), - os.environ.get('DJANGO_ALLOWED_HOSTS'), ] +ALLOWED_HOSTS.extend(os.getenv("DJANGO_ALLOWED_HOSTS", "").split(",")) # Mailman API credentials MAILMAN_REST_API_URL = os.environ.get('MAILMAN_REST_URL', 'http://mailman-core:8001') From fea6a5be6bb28fa03d233656d3a4f8d951c81057 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Fri, 7 Jul 2023 07:08:31 +0000 Subject: [PATCH 063/101] Add SERVE_FROM_DOMAIN in the testing --- tests/docker-test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker-test.yaml b/tests/docker-test.yaml index 950bbf3..2911cfe 100644 --- a/tests/docker-test.yaml +++ b/tests/docker-test.yaml @@ -8,3 +8,4 @@ services: image: maxking/mailman-web:rolling environment: - SECRET_KEY=abcdefghijklmnopqrstuv + - SERVE_FROM_DOMAIN=araj.me From 9a074a2e9b5cd0f76c99c662745aa60b8a9525c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 07:28:54 +0000 Subject: [PATCH 064/101] Bump alpine from 3.18.2 to 3.18.3 in /postorius Bumps alpine from 3.18.2 to 3.18.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 41a97ec..c91ebb4 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.2 +FROM alpine:3.18.3 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 5a985df..6a44312 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.2 +FROM alpine:3.18.3 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From bd6b8c243569e1928bfba9fd0b948b614f3a9fe3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 07:52:20 +0000 Subject: [PATCH 065/101] Bump alpine from 3.18.2 to 3.18.3 in /web Bumps alpine from 3.18.2 to 3.18.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 6f8978f..2a44997 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.2 +FROM alpine:3.18.3 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 74d76be..f534c96 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.2 +FROM alpine:3.18.3 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From 528ddba4d2f7afb062df294c779a83f3891ee857 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Mon, 28 Aug 2023 20:52:51 +0530 Subject: [PATCH 066/101] fix: Do not log full database url. Since the database contain credentials, do not log them after changing from `mysql://` to `mysql+pymysql://`. Fixes #642 --- 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 254df08..d0bd089 100755 --- a/core/docker-entrypoint.sh +++ b/core/docker-entrypoint.sh @@ -67,7 +67,7 @@ function setup_database () { # Translate mysql:// urls to mysql+mysql:// backend: if [[ "$DATABASE_URL" == mysql://* ]]; then DATABASE_URL="mysql+pymysql://${DATABASE_URL:8}" - echo "Database URL was automatically rewritten to: $DATABASE_URL" + echo "Database URL prefix was automatically rewritten to: mysql+pymysql://" fi # If DATABASE_CLASS is not set, guess it for common databases: From 4a54e9f2798bb0aec240dbab8881d49647b0da20 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Mon, 28 Aug 2023 20:56:31 +0530 Subject: [PATCH 067/101] fix: Downgrade importlib-resources to < 6.0 Since released version of Core doesn't support importlib-resources > 6. --- core/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/core/Dockerfile b/core/Dockerfile index 0abe1db..481f208 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -21,6 +21,7 @@ RUN --mount=type=cache,target=/root/.cache \ gunicorn==19.9.0 \ pymysql \ -r /tmp/requirements.txt \ + importlib-resources<6.0.0 \ && apk del build-deps \ && adduser -S mailman From 770a121c52fc9db21d27f2486bea2ccba2cfefa5 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Mon, 28 Aug 2023 21:07:27 +0530 Subject: [PATCH 068/101] quote version requirement --- core/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Dockerfile b/core/Dockerfile index 481f208..aa65927 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -21,7 +21,7 @@ RUN --mount=type=cache,target=/root/.cache \ gunicorn==19.9.0 \ pymysql \ -r /tmp/requirements.txt \ - importlib-resources<6.0.0 \ + 'importlib-resources<6.0.0' \ && apk del build-deps \ && adduser -S mailman From 022cb48778996cc9ba9a1693649574023d72af5b Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Mon, 2 Oct 2023 21:28:36 +0530 Subject: [PATCH 069/101] Fix: Add support for new version of django-allauth (#655) * Fix: Add support for new version of django-allauth * Use full path for manage.py script --- postorius/mailman-web/settings.py | 1 + web/docker-entrypoint.sh | 8 ++++---- web/mailman-web/settings.py | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/postorius/mailman-web/settings.py b/postorius/mailman-web/settings.py index ee51ac0..4f18c67 100644 --- a/postorius/mailman-web/settings.py +++ b/postorius/mailman-web/settings.py @@ -99,6 +99,7 @@ MIDDLEWARE = ( 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', 'django_mailman3.middleware.TimezoneMiddleware', + 'allauth.account.middleware.AccountMiddleware', 'postorius.middleware.PostoriusMiddleware', ) diff --git a/web/docker-entrypoint.sh b/web/docker-entrypoint.sh index 09124c9..3324d05 100755 --- a/web/docker-entrypoint.sh +++ b/web/docker-entrypoint.sh @@ -118,12 +118,12 @@ echo "Compiling locale files in $SITE_DIR" cd $SITE_DIR && /opt/mailman-web/manage.py compilemessages && cd - # Compress static files. -python3 manage.py compress --force +python3 /opt/mailman-web/manage.py compress --force # Migrate all the data to the database if this is a new installation, otherwise # this command will upgrade the database. -python3 manage.py migrate +python3 /opt/mailman-web/manage.py migrate # If MAILMAN_ADMIN_USER and MAILMAN_ADMIN_EMAIL is defined create a new # superuser for Django. There is no password setup so it can't login yet unless @@ -131,7 +131,7 @@ python3 manage.py migrate if [[ -v MAILMAN_ADMIN_USER ]] && [[ -v MAILMAN_ADMIN_EMAIL ]]; then echo "Creating admin user $MAILMAN_ADMIN_USER ..." - python3 manage.py createsuperuser --noinput --username "$MAILMAN_ADMIN_USER"\ + python3 /opt/mailman-web/manage.py createsuperuser --noinput --username "$MAILMAN_ADMIN_USER"\ --email "$MAILMAN_ADMIN_EMAIL" 2> /dev/null || \ echo "Superuser $MAILMAN_ADMIN_USER already exists" fi @@ -141,7 +141,7 @@ fi if [[ -v SERVE_FROM_DOMAIN ]]; then echo "Setting $SERVE_FROM_DOMAIN as the default domain ..." - python3 manage.py shell -c \ + python3 /opt/mailman-web/manage.py shell -c \ "from django.contrib.sites.models import Site; Site.objects.filter(domain='example.com').update(domain='$SERVE_FROM_DOMAIN', name='$SERVE_FROM_DOMAIN')" fi diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index ae03653..4903645 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -107,6 +107,7 @@ MIDDLEWARE = ( 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', + 'allauth.account.middleware.AccountMiddleware', 'django_mailman3.middleware.TimezoneMiddleware', 'postorius.middleware.PostoriusMiddleware', ) From 555508a398894eedf401acf4dc1df0bb2b19e86c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:04:56 +0000 Subject: [PATCH 070/101] Bump alpine from 3.18.3 to 3.18.4 in /web Bumps alpine from 3.18.3 to 3.18.4. --- 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 2a44997..c440f8e 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.3 +FROM alpine:3.18.4 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index f534c96..febd89e 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.3 +FROM alpine:3.18.4 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From 48c2425b4b52d2dc331b38bd702c12a21a599c95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:20:39 -0700 Subject: [PATCH 071/101] Bump alpine from 3.18.3 to 3.18.4 in /postorius (#654) Bumps alpine from 3.18.3 to 3.18.4. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index c91ebb4..d0f08e5 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.3 +FROM alpine:3.18.4 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 6a44312..789a57c 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.3 +FROM alpine:3.18.4 # Add needed files for uwsgi server + settings for django COPY mailman-web /opt/mailman-web From 5d931d4adde1087e22387f4feb335ed1d53b1980 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:21:46 +0000 Subject: [PATCH 072/101] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/publish_docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_docs.yml b/.github/workflows/publish_docs.yml index 44a503f..856a7d0 100644 --- a/.github/workflows/publish_docs.yml +++ b/.github/workflows/publish_docs.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout main - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Deploy docs uses: mhausenblas/mkdocs-deploy-gh-pages@master From 02b8ed2b6c8d7386eaddf76db5074e2daa03bb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Maldonado?= Date: Fri, 4 Aug 2023 11:31:05 +0200 Subject: [PATCH 073/101] Optimize build caching Before this commit, if docker-entrypoint or any file in mailman-web changed, the Docker build cache would not be used, so the install of dependencies would run again, uselessly --- core/Dockerfile | 6 +++--- core/Dockerfile.dev | 7 +++---- postorius/Dockerfile | 15 ++++++++------- postorius/Dockerfile.dev | 15 ++++++++------- web/Dockerfile | 14 ++++++++------ web/Dockerfile.dev | 17 +++++++++-------- 6 files changed, 39 insertions(+), 35 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index aa65927..d4d6aab 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -2,9 +2,6 @@ # Use 3.15 for Core since it has Python 3.9 FROM alpine:3.18 -#Add startup script to container -COPY docker-entrypoint.sh /usr/local/bin/ - # Add requirements file. COPY requirements.txt /tmp/ @@ -25,6 +22,9 @@ RUN --mount=type=cache,target=/root/.cache \ && apk del build-deps \ && adduser -S mailman +#Add startup script to container +COPY docker-entrypoint.sh /usr/local/bin/ + # Change the working directory. WORKDIR /opt/mailman diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 8915b43..6e2369b 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -2,14 +2,10 @@ # Use 3.15 for Core since it has Python 3.9 FROM alpine:3.18 -#Add startup script to container -COPY docker-entrypoint.sh /usr/local/bin/ - # Set the commits that we are building. ARG CORE_REF ARG MM3_HK_REF - #Install all required packages, add user for executing mailman and set execution #rights for startup script RUN --mount=type=cache,target=/root/.cache \ @@ -26,6 +22,9 @@ RUN --mount=type=cache,target=/root/.cache \ && apk del build-deps \ && adduser -S mailman +#Add startup script to container +COPY docker-entrypoint.sh /usr/local/bin/ + # Change the working directory. WORKDIR /opt/mailman diff --git a/postorius/Dockerfile b/postorius/Dockerfile index d0f08e5..439a8c9 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,11 +1,6 @@ # syntax = docker/dockerfile:1.3 FROM alpine:3.18.4 -# Add needed files for uwsgi server + settings for django -COPY mailman-web /opt/mailman-web -# Add startup script to container -COPY docker-entrypoint.sh /usr/local/bin/ - # Install packages and dependencies for postorius and hyperkitty Add user for # executing apps, change ownership for uwsgi+django files and set execution # rights for management script @@ -27,8 +22,14 @@ RUN --mount=type=cache,target=/root/.cache \ python-memcached \ && apk del .build-deps \ && addgroup -S mailman \ - && adduser -S -G mailman mailman \ - && chown -R mailman /opt/mailman-web/ \ + && adduser -S -G mailman mailman + +# Add needed files for uwsgi server + settings for django +COPY mailman-web /opt/mailman-web +# Add startup script to container +COPY docker-entrypoint.sh /usr/local/bin/ + +RUN chown -R mailman /opt/mailman-web/ \ && chmod u+x /opt/mailman-web/manage.py WORKDIR /opt/mailman-web diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 789a57c..1613acd 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,11 +1,6 @@ # syntax = docker/dockerfile:1.3 FROM alpine:3.18.4 -# Add needed files for uwsgi server + settings for django -COPY mailman-web /opt/mailman-web -# Add startup script to container -COPY docker-entrypoint.sh /usr/local/bin/ - ARG POSTORIUS_REF ARG DJ_MM3_REF ARG CLIENT_REF @@ -35,8 +30,14 @@ RUN --mount=type=cache,target=/root/.cache \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ && addgroup -S mailman \ - && adduser -S -G mailman mailman \ - && chown -R mailman /opt/mailman-web/ \ + && adduser -S -G mailman mailman + +# Add needed files for uwsgi server + settings for django +COPY mailman-web /opt/mailman-web +# Add startup script to container +COPY docker-entrypoint.sh /usr/local/bin/ + +RUN chown -R mailman /opt/mailman-web/ \ && chmod u+x /opt/mailman-web/manage.py WORKDIR /opt/mailman-web diff --git a/web/Dockerfile b/web/Dockerfile index c440f8e..704cc71 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,10 +1,6 @@ # syntax = docker/dockerfile:1.3 FROM alpine:3.18.4 -# Add needed files for uwsgi server + settings for django -COPY mailman-web /opt/mailman-web -# Add startup script to container -COPY docker-entrypoint.sh /usr/local/bin/ # Add requirements file. COPY requirements.txt /tmp/ @@ -34,8 +30,14 @@ RUN --mount=type=cache,target=/root/.cache \ tzdata \ && apk del .build-deps \ && addgroup -S mailman \ - && adduser -S -G mailman mailman \ - && chown -R mailman /opt/mailman-web/ \ + && adduser -S -G mailman mailman + +# Add needed files for uwsgi server + settings for django +COPY mailman-web /opt/mailman-web +# Add startup script to container +COPY docker-entrypoint.sh /usr/local/bin/ + +RUN chown -R mailman /opt/mailman-web/ \ && chmod u+x /opt/mailman-web/manage.py WORKDIR /opt/mailman-web diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index febd89e..285025c 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,11 +1,6 @@ # syntax = docker/dockerfile:1.3 FROM alpine:3.18.4 -# Add needed files for uwsgi server + settings for django -COPY mailman-web /opt/mailman-web -# Add startup script to container -COPY docker-entrypoint.sh /usr/local/bin/ - ARG POSTORIUS_REF ARG HYPERKITTY_REF ARG DJ_MM3_REF @@ -42,9 +37,15 @@ RUN --mount=type=cache,target=/root/.cache \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ && addgroup -S mailman \ - && adduser -S -G mailman mailman \ - && chown -R mailman /opt/mailman-web/ \ - && chmod u+x /opt/mailman-web/manage.py + && adduser -S -G mailman mailman + +# Add needed files for uwsgi server + settings for django +COPY mailman-web /opt/mailman-web +# Add startup script to container +COPY docker-entrypoint.sh /usr/local/bin/ + +RUN chown -R mailman /opt/mailman-web/ \ + && chmod u+x /opt/mailman-web/manage.py WORKDIR /opt/mailman-web From 3241f7da327079975375655109267c2c70f6b521 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 07:31:32 +0000 Subject: [PATCH 074/101] Bump django-mailman3 from 1.3.9 to 1.3.11 in /web Bumps [django-mailman3](https://gitlab.com/mailman/django-mailman3) from 1.3.9 to 1.3.11. - [Release notes](https://gitlab.com/mailman/django-mailman3/tags) - [Commits](https://gitlab.com/mailman/django-mailman3/compare/1.3.9...v1.3.11) --- updated-dependencies: - dependency-name: django-mailman3 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 61f85e2..f9de606 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,4 +1,4 @@ mailmanclient==3.3.5 postorius==1.3.8 hyperkitty==1.3.7 -django-mailman3==1.3.9 \ No newline at end of file +django-mailman3==1.3.11 \ No newline at end of file From 03928bd50701655f092a2e594cf354c1e7a3a856 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 07:49:56 +0000 Subject: [PATCH 075/101] Bump mailman from 3.3.8 to 3.3.9 in /core Bumps [mailman](https://gitlab.com/mailman/mailman) from 3.3.8 to 3.3.9. - [Release notes](https://gitlab.com/mailman/mailman/tags) - [Commits](https://gitlab.com/mailman/mailman/compare/3.3.8...v3.3.9) --- updated-dependencies: - dependency-name: mailman dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- core/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/requirements.txt b/core/requirements.txt index 48d2917..b100b91 100644 --- a/core/requirements.txt +++ b/core/requirements.txt @@ -1,5 +1,5 @@ # This is a separate file from Dockerfile so that we can use dependabot # for version updates that isn't supported for contents inside the # Dockerfile. -mailman==3.3.8 +mailman==3.3.9 mailman-hyperkitty==1.2.1 \ No newline at end of file From 1c14a3165f7cbd3b25fbef03c94c35fa75b527fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:46:44 +0000 Subject: [PATCH 076/101] Bump hyperkitty from 1.3.7 to 1.3.8 in /web Bumps [hyperkitty](https://gitlab.com/mailman/hyperkitty) from 1.3.7 to 1.3.8. - [Release notes](https://gitlab.com/mailman/hyperkitty/tags) - [Commits](https://gitlab.com/mailman/hyperkitty/compare/1.3.7...v1.3.8) --- 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 f9de606..555b417 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,4 +1,4 @@ mailmanclient==3.3.5 postorius==1.3.8 -hyperkitty==1.3.7 +hyperkitty==1.3.8 django-mailman3==1.3.11 \ No newline at end of file From 70b0a34fcad83dd4349fcab372d1e0a5a9a3020e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:56:41 +0000 Subject: [PATCH 077/101] Bump postorius from 1.3.8 to 1.3.10 in /web Bumps [postorius](https://gitlab.com/mailman/postorius) from 1.3.8 to 1.3.10. - [Release notes](https://gitlab.com/mailman/postorius/tags) - [Commits](https://gitlab.com/mailman/postorius/compare/1.3.8...v1.3.10) --- updated-dependencies: - dependency-name: postorius 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 555b417..c157bc6 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,4 +1,4 @@ mailmanclient==3.3.5 -postorius==1.3.8 +postorius==1.3.10 hyperkitty==1.3.8 django-mailman3==1.3.11 \ No newline at end of file From d341c07c0d3c4019f47bc4f2b6b702f205ff95d4 Mon Sep 17 00:00:00 2001 From: Jonathan Rietveld Date: Sat, 11 Nov 2023 23:31:31 +0100 Subject: [PATCH 078/101] Add `tzdata` dependency --- postorius/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index d0f08e5..2bbb907 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -25,6 +25,7 @@ RUN --mount=type=cache,target=/root/.cache \ typing \ django-auth-ldap \ python-memcached \ + tzdata \ && apk del .build-deps \ && addgroup -S mailman \ && adduser -S -G mailman mailman \ From dfce139f0c36cae7afbbf5c36c74478fc15ab358 Mon Sep 17 00:00:00 2001 From: Jakob Scheumann Date: Mon, 13 Nov 2023 12:00:39 +0100 Subject: [PATCH 079/101] Activate container restart --- docker-compose-mysql.yaml | 2 ++ docker-compose-postorius.yaml | 2 ++ docker-compose.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/docker-compose-mysql.yaml b/docker-compose-mysql.yaml index 269cd72..78f0cf1 100644 --- a/docker-compose-mysql.yaml +++ b/docker-compose-mysql.yaml @@ -5,6 +5,7 @@ services: image: maxking/mailman-core:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-core hostname: mailman-core + restart: unless-stopped volumes: - /opt/mailman/core:/opt/mailman/ stop_grace_period: 30s @@ -26,6 +27,7 @@ services: image: maxking/mailman-web:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-web hostname: mailman-web + restart: unless-stopped depends_on: - database links: diff --git a/docker-compose-postorius.yaml b/docker-compose-postorius.yaml index 3bcfff7..4e733cf 100644 --- a/docker-compose-postorius.yaml +++ b/docker-compose-postorius.yaml @@ -5,6 +5,7 @@ services: image: maxking/mailman-core:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-core hostname: mailman-core + restart: unless-stopped volumes: - /opt/mailman/core:/opt/mailman/ stop_grace_period: 30s @@ -26,6 +27,7 @@ services: image: maxking/postorius:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-web hostname: mailman-web + restart: unless-stopped depends_on: - database links: diff --git a/docker-compose.yaml b/docker-compose.yaml index 58d1d78..4d49da2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,6 +5,7 @@ services: image: maxking/mailman-core:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-core hostname: mailman-core + restart: unless-stopped volumes: - /opt/mailman/core:/opt/mailman/ stop_grace_period: 30s @@ -27,6 +28,7 @@ services: image: maxking/mailman-web:0.4 # Use a specific version tag (tag latest is not published) container_name: mailman-web hostname: mailman-web + restart: unless-stopped depends_on: - database links: From ec4c182cf7ee2b3534177489352d4514ebdf72ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 07:35:50 +0000 Subject: [PATCH 080/101] Bump alpine from 3.18.4 to 3.19.0 in /postorius Bumps alpine from 3.18.4 to 3.19.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... 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 7e329f6..8c54a19 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.4 +FROM alpine:3.19.0 # 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 1613acd..6b10970 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.4 +FROM alpine:3.19.0 ARG POSTORIUS_REF ARG DJ_MM3_REF From 310e5acd3bbb770b47fe2956a6a7f36cef99ba9c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 07:39:09 +0000 Subject: [PATCH 081/101] Bump alpine from 3.18.4 to 3.19.0 in /web Bumps alpine from 3.18.4 to 3.19.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... 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 704cc71..e6d2c35 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.4 +FROM alpine:3.19.0 # Add requirements file. COPY requirements.txt /tmp/ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 285025c..a1754be 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.18.4 +FROM alpine:3.19.0 ARG POSTORIUS_REF ARG HYPERKITTY_REF From 6ea65506720618e75ce7d7ddc545066b264732e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 07:41:37 +0000 Subject: [PATCH 082/101] Bump actions/stale from 8 to 9 Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v8...v9) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index b44f574..bc81445 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -18,7 +18,7 @@ jobs: pull-requests: write steps: - - uses: actions/stale@v8 + - uses: actions/stale@v9 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'This issue has not been updated for more than 1year' From dc8d0e7adc2c0c6416ebbe594b849b2dfe6b780d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 07:52:13 +0000 Subject: [PATCH 083/101] Bump alpine from 3.18 to 3.19 in /core Bumps alpine from 3.18 to 3.19. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- core/Dockerfile | 2 +- core/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index d4d6aab..9ccd2cd 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.3 # Use 3.15 for Core since it has Python 3.9 -FROM alpine:3.18 +FROM alpine:3.19 # Add requirements file. COPY requirements.txt /tmp/ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 6e2369b..1814afd 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.3 # Use 3.15 for Core since it has Python 3.9 -FROM alpine:3.18 +FROM alpine:3.19 # Set the commits that we are building. ARG CORE_REF From cb243f46bb38f7de92e34b67cbe70890a09a0241 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Mon, 11 Dec 2023 23:30:25 +0530 Subject: [PATCH 084/101] Update pip to allow breaking system packages --- web/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index e6d2c35..3a9e42c 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -14,8 +14,8 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ - && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ - && pip install -r /tmp/requirements.txt \ + && pip install --break-system-packages -U 'Django<4.2' pip setuptools wheel \ + && pip install --break-system-packages -r /tmp/requirements.txt \ whoosh \ uwsgi \ psycopg2 \ From e00436fbd67fe1f47d5b21279101b127265ebcb0 Mon Sep 17 00:00:00 2001 From: Thomas Makin Date: Tue, 19 Dec 2023 19:26:56 -0500 Subject: [PATCH 085/101] postorius: fix urls for newer django `path()` no longer accepts regex paths; you must instead import and use `re_path()`. --- postorius/mailman-web/urls.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/postorius/mailman-web/urls.py b/postorius/mailman-web/urls.py index 6a9bbaf..3e3c312 100644 --- a/postorius/mailman-web/urls.py +++ b/postorius/mailman-web/urls.py @@ -18,16 +18,16 @@ from django.conf.urls import include from django.contrib import admin -from django.urls import path, reverse_lazy +from django.urls import re_path, reverse_lazy from django.views.generic import RedirectView urlpatterns = [ - path(r'^$', RedirectView.as_view( + re_path(r'^$', RedirectView.as_view( url=reverse_lazy('list_index'), permanent=True)), - path(r'postorius/', include('postorius.urls')), - path(r'', include('django_mailman3.urls')), - path(r'accounts/', include('allauth.urls')), + re_path(r'postorius/', include('postorius.urls')), + re_path(r'', include('django_mailman3.urls')), + re_path(r'accounts/', include('allauth.urls')), # Django admin - path(r'^admin/', admin.site.urls), + re_path(r'^admin/', admin.site.urls), ] From f3bca541209226ecf6d1a3747c7ce440e707fe96 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Tue, 26 Dec 2023 10:47:22 +0000 Subject: [PATCH 086/101] Add --break-system-packages so pip works on system Python --- core/Dockerfile | 4 ++-- core/Dockerfile.dev | 4 ++-- postorius/Dockerfile | 4 ++-- postorius/Dockerfile.dev | 8 ++++---- web/Dockerfile | 4 ++-- web/Dockerfile.dev | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/core/Dockerfile b/core/Dockerfile index d4d6aab..253aeee 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -13,8 +13,8 @@ RUN --mount=type=cache,target=/root/.cache \ # Mailman html to plaintext conversion uses lynx. # psutil needs linux-headers to compile on musl c library. && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c lynx tzdata \ - && python3 -m pip install -U pip setuptools wheel \ - && python3 -m pip install psycopg2 \ + && python3 -m pip install --break-system-packages -U pip setuptools wheel \ + && python3 -m pip install --break-system-packages psycopg2 \ gunicorn==19.9.0 \ pymysql \ -r /tmp/requirements.txt \ diff --git a/core/Dockerfile.dev b/core/Dockerfile.dev index 6e2369b..bf53734 100644 --- a/core/Dockerfile.dev +++ b/core/Dockerfile.dev @@ -14,8 +14,8 @@ RUN --mount=type=cache,target=/root/.cache \ postgresql-dev git libffi-dev g++ \ && apk add --no-cache bash su-exec postgresql-client mysql-client \ curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c tzdata \ - && python3 -m pip install -U psycopg2 pymysql setuptools wheel \ - && python3 -m pip install \ + && python3 -m pip install -U --break-system-packages psycopg2 pymysql setuptools wheel \ + && python3 -m pip install --break-system-packages \ git+https://gitlab.com/mailman/mailman \ git+https://gitlab.com/mailman/mailman-hyperkitty \ gunicorn==19.9.0 \ diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 8c54a19..b668805 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -11,8 +11,8 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip libffi libuuid pcre-dev py-cryptography \ - && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ - && python3 -m pip install postorius==1.3.7 \ + && python3 -m pip install --break-system-packages -U 'Django<4.2' pip setuptools wheel \ + && python3 -m pip install --break-system-packages postorius==1.3.7 \ uwsgi \ 'psycopg2<2.9' \ dj-database-url \ diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 6b10970..0321c6c 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -15,8 +15,8 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap \ python3 py3-pip libffi gettext py-cryptography \ - && python3 -m pip install -U pip setuptools wheel \ - && python3 -m pip install -U \ + && python3 -m pip install --break-system-packages -U pip setuptools wheel \ + && python3 -m pip install --break-system-packages -U \ git+https://gitlab.com/mailman/mailmanclient \ git+https://gitlab.com/mailman/postorius \ uwsgi \ @@ -25,8 +25,8 @@ RUN --mount=type=cache,target=/root/.cache \ mysqlclient \ typing \ django-utils-six \ - && python3 -m pip install -U 'Django<3.2' \ - && python3 -m pip install -U \ + && python3 -m pip install --break-system-packages -U 'Django<3.2' \ + && python3 -m pip install --break-system-packages -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ && addgroup -S mailman \ diff --git a/web/Dockerfile b/web/Dockerfile index 704cc71..e6956b8 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -14,8 +14,8 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ - && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ - && pip install -r /tmp/requirements.txt \ + && python3 -m pip install --break-system-packages -U 'Django<4.2' pip setuptools wheel \ + && pip install --break-system-packages -r /tmp/requirements.txt \ whoosh \ uwsgi \ psycopg2 \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 285025c..a875b02 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -16,8 +16,8 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc pcre-dev tzdata \ python3 py3-pip postgresql-client mysql-client py3-mysqlclient \ curl mailcap xapian-core xapian-bindings-python3 libffi gettext py-cryptography \ - && python3 -m pip install -U pip setuptools wheel \ - && python3 -m pip install -U \ + && python3 -m pip install --break-system-packages -U pip setuptools wheel \ + && python3 -m pip install --break-system-packages -U \ git+https://gitlab.com/mailman/mailmanclient \ git+https://gitlab.com/mailman/postorius \ git+https://gitlab.com/mailman/hyperkitty \ @@ -32,8 +32,8 @@ RUN --mount=type=cache,target=/root/.cache \ tzdata \ diskcache \ django-utils-six \ - && python3 -m pip install -U 'Django<4.2' \ - && python3 -m pip install -U \ + && python3 -m pip install --break-system-packages -U 'Django<4.2' \ + && python3 -m pip install --break-system-packages -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ && addgroup -S mailman \ From 2708b63fbd2a2ad8c73a892c5671444bf1c47474 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sat, 30 Dec 2023 04:11:32 +0000 Subject: [PATCH 087/101] fix: Add humaize for django-allauth --- postorius/mailman-web/settings.py | 1 + web/mailman-web/settings.py | 1 + 2 files changed, 2 insertions(+) diff --git a/postorius/mailman-web/settings.py b/postorius/mailman-web/settings.py index 4f18c67..57e64e3 100644 --- a/postorius/mailman-web/settings.py +++ b/postorius/mailman-web/settings.py @@ -76,6 +76,7 @@ DEFAULT_APPS = [ 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django.contrib.humanize', 'django_gravatar', 'allauth', 'allauth.account', diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index 4903645..d5c5df9 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -79,6 +79,7 @@ DEFAULT_APPS = [ 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', + 'django.contrib.humanize', 'rest_framework', 'django_gravatar', 'compressor', From 2331cb3c9bb0e2a9b451c8fdcb638c0711652c43 Mon Sep 17 00:00:00 2001 From: Jonathan Rietveld Date: Sat, 6 Jan 2024 02:56:24 +0100 Subject: [PATCH 088/101] Add libldap dependency (#679) --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index b668805..00d96a3 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -6,7 +6,7 @@ FROM alpine:3.19.0 # rights for management script RUN --mount=type=cache,target=/root/.cache \ set -ex \ - && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \ + && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers libldap \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev openldap-dev cargo rust \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 0321c6c..774e916 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -10,7 +10,7 @@ ARG CLIENT_REF # rights for management script RUN --mount=type=cache,target=/root/.cache \ set -ex \ - && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \ + && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers libldap \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev git cargo rust \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap \ diff --git a/web/Dockerfile b/web/Dockerfile index 9d3b8d6..eb673a8 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -9,7 +9,7 @@ COPY requirements.txt /tmp/ # rights for management script RUN --mount=type=cache,target=/root/.cache \ set -ex \ - && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers \ + && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers libldap \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev openldap-dev cargo rust \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index 558869f..c9edb69 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -11,7 +11,7 @@ ARG CLIENT_REF # rights for management script RUN --mount=type=cache,target=/root/.cache \ set -ex \ - && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers git \ + && apk add --no-cache --virtual .build-deps gcc libc-dev linux-headers git libldap \ postgresql-dev mariadb-dev mariadb-connector-c python3-dev libffi-dev openldap-dev cargo rust \ && apk add --no-cache --virtual .mailman-rundeps bash sassc pcre-dev tzdata \ python3 py3-pip postgresql-client mysql-client py3-mysqlclient \ From 06e0ed0f00298d3593392fe99ff79ec34d621f1d Mon Sep 17 00:00:00 2001 From: Jonathan Rietveld Date: Sat, 6 Jan 2024 02:56:56 +0100 Subject: [PATCH 089/101] fix: Typos in comments (#680) --- postorius/mailman-web/uwsgi.ini | 4 ++-- web/mailman-web/uwsgi.ini | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/postorius/mailman-web/uwsgi.ini b/postorius/mailman-web/uwsgi.ini index 9c025ee..e5d00a6 100644 --- a/postorius/mailman-web/uwsgi.ini +++ b/postorius/mailman-web/uwsgi.ini @@ -3,7 +3,7 @@ uwsgi-socket = 0.0.0.0:8080 http-socket = 0.0.0.0:8000 -# Move to the directory wher the django files are. +# Move to the directory where the django files are. chdir = /opt/mailman-web # Use the wsgi file provided with the django project. @@ -14,7 +14,7 @@ master = true processes = 2 threads = 2 -# Drop privielges and don't run as root. +# Drop privileges and don't run as root. uid = mailman gid = mailman diff --git a/web/mailman-web/uwsgi.ini b/web/mailman-web/uwsgi.ini index 8e917a3..897ebad 100644 --- a/web/mailman-web/uwsgi.ini +++ b/web/mailman-web/uwsgi.ini @@ -3,13 +3,13 @@ uwsgi-socket = 0.0.0.0:8080 http-socket = 0.0.0.0:8000 -#Enable threading for python +# Enable threading for python enable-threads = true # Setting uwsgi buffer size to what Apache2 supports. buffer-size = 8190 -# Move to the directory wher the django files are. +# Move to the directory where the django files are. chdir = /opt/mailman-web # Use the wsgi file provided with the django project. @@ -20,7 +20,7 @@ master = true processes = 2 threads = 2 -# Drop privielges and don't run as root. +# Drop privileges and don't run as root. uid = mailman gid = mailman From 1fc0716564c870c52c861a7700eda3d03c862f81 Mon Sep 17 00:00:00 2001 From: mmurphy <52948395+mm534@users.noreply.github.com> Date: Mon, 22 Jan 2024 14:59:28 +1100 Subject: [PATCH 090/101] prevent mailman-web dns lookup from throwing (#681) --- web/mailman-web/settings.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index d5c5df9..7ab51ed 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -29,7 +29,7 @@ https://docs.djangoproject.com/en/1.8/ref/settings/ import os import dj_database_url import sys -from socket import gethostbyname +from socket import gethostbyname, gaierror BASE_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -50,9 +50,14 @@ SITE_ID = 1 ALLOWED_HOSTS = [ "localhost", # Archiving API from Mailman, keep it. "mailman-web", - gethostbyname("mailman-web"), os.environ.get('SERVE_FROM_DOMAIN'), ] + +try: + ALLOWED_HOSTS.append(gethostbyname("mailman-web")) # only add if this resolves +except gaierror: + pass + ALLOWED_HOSTS.extend(os.getenv("DJANGO_ALLOWED_HOSTS", "").split(",")) # Mailman API credentials From a3a20f4cdbbac1edbaab173633a4368590e289be Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Wed, 24 Jan 2024 13:05:04 +0530 Subject: [PATCH 091/101] Repalce python-memcached with pymemcache (#682) * Repalce python-memcached with pylibmc Fixes #665 * Replace 2nd instance of python-memcached. * Use pure python implementation in pymemcache --- web/Dockerfile | 2 +- web/Dockerfile.dev | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index eb673a8..63ba3c5 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -24,7 +24,7 @@ RUN --mount=type=cache,target=/root/.cache \ typing \ xapian-haystack \ django-auth-ldap \ - python-memcached \ + pymemcache \ diskcache \ django-utils-six \ tzdata \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index c9edb69..a65fa83 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -28,8 +28,8 @@ RUN --mount=type=cache,target=/root/.cache \ mysqlclient \ xapian-haystack \ django-auth-ldap \ - python-memcached \ - tzdata \ + pymemcache \ + tzdata \ diskcache \ django-utils-six \ && python3 -m pip install --break-system-packages -U 'Django<4.2' \ From 846394b5d78cf593a62266132b163d63c8a6983b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 08:43:18 +0530 Subject: [PATCH 092/101] Bump alpine from 3.19.0 to 3.19.1 in /web (#684) --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 63ba3c5..b01125d 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.19.0 +FROM alpine:3.19.1 # Add requirements file. COPY requirements.txt /tmp/ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index a65fa83..ece0282 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.19.0 +FROM alpine:3.19.1 ARG POSTORIUS_REF ARG HYPERKITTY_REF From a4a435e19dda7a37ae084773cde79d4381059189 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 4 Feb 2024 08:43:25 +0530 Subject: [PATCH 093/101] Bump alpine from 3.19.0 to 3.19.1 in /postorius (#683) --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 00d96a3..4dd5289 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.19.0 +FROM alpine:3.19.1 # 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 774e916..4cc7c82 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.19.0 +FROM alpine:3.19.1 ARG POSTORIUS_REF ARG DJ_MM3_REF From a38d49a66aee9ea41c5b7600349320c26a23704d Mon Sep 17 00:00:00 2001 From: Mohazza <58814157+mohazza00@users.noreply.github.com> Date: Fri, 16 Feb 2024 10:33:16 +0100 Subject: [PATCH 094/101] Bump postorius from 1.3.7 to 1.3.10 (#685) --- postorius/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 4dd5289..207ed11 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -12,9 +12,9 @@ RUN --mount=type=cache,target=/root/.cache \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip libffi libuuid pcre-dev py-cryptography \ && python3 -m pip install --break-system-packages -U 'Django<4.2' pip setuptools wheel \ - && python3 -m pip install --break-system-packages postorius==1.3.7 \ + && python3 -m pip install --break-system-packages postorius==1.3.10 \ uwsgi \ - 'psycopg2<2.9' \ + psycopg2 \ dj-database-url \ mysqlclient \ typing \ From 3cf6e5d18d025c9f416770c6df024bfdaddbf1c8 Mon Sep 17 00:00:00 2001 From: am97 Date: Sun, 25 Feb 2024 06:40:38 +0100 Subject: [PATCH 095/101] Avoid Django 3.2+ warning (#686) --- postorius/mailman-web/settings.py | 5 +++++ web/mailman-web/settings.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/postorius/mailman-web/settings.py b/postorius/mailman-web/settings.py index 57e64e3..ab10f2b 100644 --- a/postorius/mailman-web/settings.py +++ b/postorius/mailman-web/settings.py @@ -143,6 +143,11 @@ DATABASES = { 'default': dj_database_url.config(conn_max_age=600) } +# Avoid Django 3.2+ warning +# https://github.com/maxking/docker-mailman/issues/595 +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + + # If you're behind a proxy, use the X-Forwarded-Host header # See https://docs.djangoproject.com/en/1.8/ref/settings/#use-x-forwarded-host USE_X_FORWARDED_HOST = True diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index 7ab51ed..c19a827 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -156,6 +156,11 @@ DATABASES = { 'default': dj_database_url.config(conn_max_age=600) } +# Avoid Django 3.2+ warning +# https://github.com/maxking/docker-mailman/issues/595 +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + + # If you're behind a proxy, use the X-Forwarded-Host header # See https://docs.djangoproject.com/en/1.8/ref/settings/#use-x-forwarded-host USE_X_FORWARDED_HOST = True From 1ed26bb04af0c46d1a0a1b3496188b4957afdce5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 15:30:02 +0530 Subject: [PATCH 096/101] Bump hyperkitty from 1.3.8 to 1.3.9 in /web (#687) --- web/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/requirements.txt b/web/requirements.txt index c157bc6..e6dcc61 100644 --- a/web/requirements.txt +++ b/web/requirements.txt @@ -1,4 +1,4 @@ mailmanclient==3.3.5 postorius==1.3.10 -hyperkitty==1.3.8 +hyperkitty==1.3.9 django-mailman3==1.3.11 \ No newline at end of file From cee738a9df309e47957200443dc2759a8de4489f Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Sun, 17 Mar 2024 10:32:51 +0530 Subject: [PATCH 097/101] Bump postgres to 12 from 11 in compose (#691) Since Django 4.2 doesn't support below that, we need to bump to Postgres 12. Django 4.1 is no longer supported, so 4.2 is the lowest version we support here. --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 4d49da2..b23fdb0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -51,7 +51,7 @@ services: - POSTGRES_DB=mailmandb - POSTGRES_USER=mailman - POSTGRES_PASSWORD=mailmanpass - image: postgres:11-alpine + image: postgres:12-alpine volumes: - /opt/mailman/database:/var/lib/postgresql/data networks: From 21684ce83833af02ddc8118161d2d337b320bb8e Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Fri, 7 Jun 2024 13:27:10 +0530 Subject: [PATCH 098/101] Update max supported Django versions (#699) * Update max supported Django versions * Add dependency on python-openid * Use the right dependency * Also bump django version * Add python-openid specifically to deps * Add dependency on openid too --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 4 ++-- web/Dockerfile | 3 ++- web/Dockerfile.dev | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index 207ed11..c157df9 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -11,7 +11,7 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip libffi libuuid pcre-dev py-cryptography \ - && python3 -m pip install --break-system-packages -U 'Django<4.2' pip setuptools wheel \ + && python3 -m pip install --break-system-packages -U 'Django<4.3' pip setuptools wheel \ && python3 -m pip install --break-system-packages postorius==1.3.10 \ uwsgi \ psycopg2 \ diff --git a/postorius/Dockerfile.dev b/postorius/Dockerfile.dev index 4cc7c82..fe02d3f 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -20,12 +20,12 @@ RUN --mount=type=cache,target=/root/.cache \ git+https://gitlab.com/mailman/mailmanclient \ git+https://gitlab.com/mailman/postorius \ uwsgi \ - 'psycopg2<2.9' \ + psycopg2 \ dj-database-url \ mysqlclient \ typing \ django-utils-six \ - && python3 -m pip install --break-system-packages -U 'Django<3.2' \ + && python3 -m pip install --break-system-packages -U 'Django<4.3' \ && python3 -m pip install --break-system-packages -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ diff --git a/web/Dockerfile b/web/Dockerfile index b01125d..1c502e0 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -14,7 +14,7 @@ RUN --mount=type=cache,target=/root/.cache \ && apk add --no-cache --virtual .mailman-rundeps bash sassc tzdata \ postgresql-client mysql-client py3-mysqlclient curl mailcap gettext \ python3 py3-pip xapian-core xapian-bindings-python3 libffi pcre-dev py-cryptography \ - && python3 -m pip install --break-system-packages -U 'Django<4.2' pip setuptools wheel \ + && python3 -m pip install --break-system-packages -U 'Django<4.3' pip setuptools wheel \ && pip install --break-system-packages -r /tmp/requirements.txt \ whoosh \ uwsgi \ @@ -28,6 +28,7 @@ RUN --mount=type=cache,target=/root/.cache \ diskcache \ django-utils-six \ tzdata \ + 'django-allauth[socialaccount,openid]' \ && apk del .build-deps \ && addgroup -S mailman \ && adduser -S -G mailman mailman diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index ece0282..f3ecd5e 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -32,7 +32,8 @@ RUN --mount=type=cache,target=/root/.cache \ tzdata \ diskcache \ django-utils-six \ - && python3 -m pip install --break-system-packages -U 'Django<4.2' \ + 'django-allauth[socialaccount,openid]' \ + && python3 -m pip install --break-system-packages -U 'Django<4.3' \ && python3 -m pip install --break-system-packages -U \ git+https://gitlab.com/mailman/django-mailman3 \ && apk del .build-deps \ From 32e38a9e884750c4cd34040b8f0fe8679a4cfb16 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Fri, 7 Jun 2024 18:57:10 +0530 Subject: [PATCH 099/101] Migrate to using new CI config (#700) * Migrate to using new CI config * Use the default CI machine --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1cc8dcb..873f4a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: type: string default: "no" machine: - image: ubuntu-2004:202010-01 + image: default environment: DOCKER_BUILDKIT: 1 BUILDKIT_PROGRESS: plain @@ -37,8 +37,8 @@ jobs: DB: mysql name: MySQL Test command: bash tests/test.sh - - deploy: - name: Deploy + - run: + name: Run version command: | python3 --version python3 deploy.py From 2562a83a4d9e85853a69d7c4509ef21457b64a49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 17:49:32 -0700 Subject: [PATCH 100/101] Bump alpine from 3.19.1 to 3.20.0 in /web (#696) Bumps alpine from 3.19.1 to 3.20.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- web/Dockerfile | 2 +- web/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 1c502e0..2c2f464 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.19.1 +FROM alpine:3.20.0 # Add requirements file. COPY requirements.txt /tmp/ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index f3ecd5e..7c93f3c 100644 --- a/web/Dockerfile.dev +++ b/web/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.19.1 +FROM alpine:3.20.0 ARG POSTORIUS_REF ARG HYPERKITTY_REF From 301aa1f30b2e34856dc020a8c20280b471da924b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 17:49:47 -0700 Subject: [PATCH 101/101] Bump alpine from 3.19.1 to 3.20.0 in /postorius (#695) Bumps alpine from 3.19.1 to 3.20.0. --- updated-dependencies: - dependency-name: alpine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- postorius/Dockerfile | 2 +- postorius/Dockerfile.dev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/postorius/Dockerfile b/postorius/Dockerfile index c157df9..93eaca8 100644 --- a/postorius/Dockerfile +++ b/postorius/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.19.1 +FROM alpine:3.20.0 # 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 fe02d3f..b80a66c 100644 --- a/postorius/Dockerfile.dev +++ b/postorius/Dockerfile.dev @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.3 -FROM alpine:3.19.1 +FROM alpine:3.20.0 ARG POSTORIUS_REF ARG DJ_MM3_REF