From 208017f9a00fdaf1b2d0671e97fb879e804fd911 Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Tue, 25 Oct 2022 23:25:57 -0700 Subject: [PATCH] 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), ]