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.
This commit is contained in:
Abhilash Raj
2022-10-25 23:25:57 -07:00
committed by GitHub
parent 2693386453
commit 208017f9a0
5 changed files with 38 additions and 21 deletions

18
.github/dependabot.yml vendored Normal file
View File

@@ -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"

View File

@@ -49,7 +49,7 @@ services:
- POSTGRES_DB=mailmandb - POSTGRES_DB=mailmandb
- POSTGRES_USER=mailman - POSTGRES_USER=mailman
- POSTGRES_PASSWORD=mailmanpass - POSTGRES_PASSWORD=mailmanpass
image: postgres:9.6-alpine image: postgres:11-alpine
volumes: volumes:
- /opt/mailman/database:/var/lib/postgresql/data - /opt/mailman/database:/var/lib/postgresql/data
networks: networks:
@@ -62,4 +62,4 @@ networks:
driver: default driver: default
config: config:
- -
subnet: 172.19.199.0/24 subnet: 172.19.199.0/24

View File

@@ -16,19 +16,18 @@
# You should have received a copy of the GNU General Public License along with # You should have received a copy of the GNU General Public License along with
# Postorius. If not, see <http://www.gnu.org/licenses/>. # Postorius. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import include
from django.conf.urls import include, url
from django.contrib import admin from django.contrib import admin
from django.urls import reverse_lazy from django.urls import path, reverse_lazy
from django.views.generic import RedirectView from django.views.generic import RedirectView
urlpatterns = [ urlpatterns = [
url(r'^$', RedirectView.as_view( path(r'^$', RedirectView.as_view(
url=reverse_lazy('list_index'), url=reverse_lazy('list_index'),
permanent=True)), permanent=True)),
url(r'^postorius/', include('postorius.urls')), path(r'postorius/', include('postorius.urls')),
url(r'', include('django_mailman3.urls')), path(r'', include('django_mailman3.urls')),
url(r'^accounts/', include('allauth.urls')), path(r'accounts/', include('allauth.urls')),
# Django admin # Django admin
url(r'^admin/', admin.site.urls), path(r'^admin/', admin.site.urls),
] ]

View File

@@ -33,10 +33,11 @@ RUN --mount=type=cache,target=/root/.cache \
mysqlclient \ mysqlclient \
xapian-haystack \ xapian-haystack \
django-auth-ldap \ django-auth-ldap \
python-memcached \ python-memcached \
tzdata \
diskcache \ diskcache \
django-utils-six \ django-utils-six \
&& python3 -m pip install -U 'Django<3.2' \ && python3 -m pip install -U 'Django<4.3' \
&& python3 -m pip install -U \ && python3 -m pip install -U \
git+https://gitlab.com/mailman/django-mailman3 \ git+https://gitlab.com/mailman/django-mailman3 \
&& apk del .build-deps \ && apk del .build-deps \

View File

@@ -16,20 +16,19 @@
# You should have received a copy of the GNU General Public License along with # You should have received a copy of the GNU General Public License along with
# Postorius. If not, see <http://www.gnu.org/licenses/>. # Postorius. If not, see <http://www.gnu.org/licenses/>.
from django.conf.urls import include
from django.conf.urls import include, url
from django.contrib import admin from django.contrib import admin
from django.urls import reverse_lazy from django.urls import path, reverse_lazy
from django.views.generic import RedirectView from django.views.generic import RedirectView
urlpatterns = [ urlpatterns = [
url(r'^$', RedirectView.as_view( path(r'^$', RedirectView.as_view(
url=reverse_lazy('list_index'), url=reverse_lazy('list_index'),
permanent=True)), permanent=True)),
url(r'^postorius/', include('postorius.urls')), path(r'postorius/', include('postorius.urls')),
url(r'^hyperkitty/', include('hyperkitty.urls')), path(r'hyperkitty/', include('hyperkitty.urls')),
url(r'', include('django_mailman3.urls')), path(r'', include('django_mailman3.urls')),
url(r'^accounts/', include('allauth.urls')), path(r'accounts/', include('allauth.urls')),
# Django admin # Django admin
url(r'^admin/', admin.site.urls), path(r'^admin/', admin.site.urls),
] ]