diff --git a/web/Dockerfile b/web/Dockerfile index 1cde21f..fed84a3 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 @@ -18,11 +18,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<4.1' pip setuptools wheel \ + && python3 -m pip install -U 'Django<4.2' pip setuptools wheel \ && pip install -r /tmp/requirements.txt \ whoosh \ uwsgi \ - 'psycopg2<2.9' \ + psycopg2 \ dj-database-url \ mysqlclient \ typing \ diff --git a/web/Dockerfile.dev b/web/Dockerfile.dev index adcedde..978ab0f 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 @@ -28,7 +28,7 @@ RUN --mount=type=cache,target=/root/.cache \ git+https://gitlab.com/mailman/hyperkitty \ whoosh \ uwsgi \ - 'psycopg2<2.9' \ + psycopg2 \ dj-database-url \ mysqlclient \ xapian-haystack \ @@ -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 \