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 1/4] 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 95643047060448176d96b606a439658c46976eff Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Fri, 16 Jun 2023 07:58:02 +0000 Subject: [PATCH 2/4] 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 3/4] 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 4/4] 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 \