diff --git a/Dockerfile b/Dockerfile index 9ccf06e..f22b08e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,24 @@ -# Use an official Python runtime based on Debian 10 "buster" as a parent image. -FROM python:3.8.1-slim-buster +# Use an official Python runtime based on Debian 12 "bookworm" as a parent image. +FROM python:3.12-slim-bookworm # Add user that will be used in the container. RUN useradd wagtail # Port used by this container to serve HTTP. -EXPOSE 80 +EXPOSE 8000 # Set environment variables. # 1. Force Python stdout and stderr streams to be unbuffered. # 2. Set PORT variable that is used by Gunicorn. This should match "EXPOSE" # command. ENV PYTHONUNBUFFERED=1 \ - PORT=80 + PORT=8000 # Install system packages required by Wagtail and Django. RUN apt-get update --yes --quiet && apt-get install --yes --quiet --no-install-recommends \ build-essential \ libpq-dev \ - libmariadbclient-dev \ + libmariadb-dev \ libjpeg62-turbo-dev \ zlib1g-dev \ libwebp-dev \ diff --git a/mysite/settings/base.py b/mysite/settings/base.py index ecee302..e305365 100644 --- a/mysite/settings/base.py +++ b/mysite/settings/base.py @@ -1,13 +1,13 @@ """ Django settings for mysite project. -Generated by 'django-admin startproject' using Django 4.2.13. +Generated by 'django-admin startproject' using Django 5.1. For more information on this file, see -https://docs.djangoproject.com/en/4.2/topics/settings/ +https://docs.djangoproject.com/en/5.1/topics/settings/ For the full list of settings and their values, see -https://docs.djangoproject.com/en/4.2/ref/settings/ +https://docs.djangoproject.com/en/5.1/ref/settings/ """ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) @@ -99,7 +99,7 @@ # Password validation -# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators +# https://docs.djangoproject.com/en/5.1/ref/settings/#auth-password-validators AUTH_PASSWORD_VALIDATORS = [ { @@ -118,7 +118,7 @@ # Internationalization -# https://docs.djangoproject.com/en/4.2/topics/i18n/ +# https://docs.djangoproject.com/en/5.1/topics/i18n/ LANGUAGE_CODE = "en-us" @@ -130,7 +130,7 @@ # Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/4.2/howto/static-files/ +# https://docs.djangoproject.com/en/5.1/howto/static-files/ STATICFILES_FINDERS = [ "django.contrib.staticfiles.finders.FileSystemFinder", diff --git a/mysite/templates/base.html b/mysite/templates/base.html index 34b7228..79e2a17 100644 --- a/mysite/templates/base.html +++ b/mysite/templates/base.html @@ -24,7 +24,7 @@ {% endif %} {# Global stylesheets #} - + {% block extra_css %} {# Override this in templates to add extra stylesheets #} @@ -37,7 +37,7 @@ {% block content %}{% endblock %} {# Global javascript #} - + {% block extra_js %} {# Override this in templates to add extra javascript #} diff --git a/mysite/wsgi.py b/mysite/wsgi.py index c450d24..db6f49e 100644 --- a/mysite/wsgi.py +++ b/mysite/wsgi.py @@ -4,7 +4,7 @@ It exposes the WSGI callable as a module-level variable named ``application``. For more information on this file, see -https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/ +https://docs.djangoproject.com/en/5.1/howto/deployment/wsgi/ """ import os diff --git a/requirements.txt b/requirements.txt index 1f7ff78..02b064f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -Django>=4.2,<5.1 -wagtail>=6.1,<6.2 +Django>=5.1,<5.2 +wagtail>=6.2,<6.3 dj-database-url==2.2.0 psycopg[binary]>=3.1,<3.2