diff --git a/.dockerignore b/.dockerignore index bb246a0..fa8fa40 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,3 @@ -.idea/ # Django project /media/ /static/ diff --git a/.idea/iamkonstantin-web.iml b/.idea/iamkonstantin-web.iml index 79d7ae9..4a1b312 100644 --- a/.idea/iamkonstantin-web.iml +++ b/.idea/iamkonstantin-web.iml @@ -15,9 +15,8 @@ - - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 6de942c..d0b0933 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index cc66fa1..92c6246 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Use an official Python runtime based on Debian 10 "buster" as a parent image. -FROM python:3.12-slim +FROM python:3.11-slim-buster # Add user that will be used in the container. # RUN useradd wagtail @@ -15,10 +15,10 @@ ENV PYTHONUNBUFFERED=1 \ PORT=8000 # Install system packages required by Wagtail and Django. -RUN apt-get update --yes --quiet && apt-get install --yes --no-install-recommends \ -# build-essential \ -# libpq-dev \ -# libmariadbclient-dev \ +RUN apt-get update --yes --quiet && apt-get install --yes --quiet --no-install-recommends \ + build-essential \ + libpq-dev \ + libmariadbclient-dev \ libjpeg62-turbo-dev \ zlib1g-dev \ libwebp-dev \ diff --git a/Makefile b/Makefile index 32fbc0a..d1735b6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: help build publish -VERSION = 1.3.0 +VERSION = 1.2.4 help: @perl -nle'print $& if m{^[a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' diff --git a/iamkonstantin_web/templates/base.html b/iamkonstantin_web/templates/base.html index ab2c782..48dd9f2 100644 --- a/iamkonstantin_web/templates/base.html +++ b/iamkonstantin_web/templates/base.html @@ -64,7 +64,7 @@
{% include "includes/header.html" %} -
+
{% block content %}{% endblock %}
diff --git a/requirements.txt b/requirements.txt index 69558ab..a373c2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -Django>=4.2,<5.2 -wagtail>=6.3,<6.4 +Django>=4.2,<5.1 +wagtail>=6.2.2,<6.3 whitenoise>=6.6,<7.0 wagtailcodeblock>=1.29.0.2,<2.0 django-tailwind>=3.6.0