From c81a13a12a3635532fc6ae0534909b99f5c7e2e7 Mon Sep 17 00:00:00 2001
From: Konstantin Kostov <konstantin@headbright.be>
Date: Fri, 8 Nov 2024 09:59:04 +0100
Subject: [PATCH 1/3] feat: upgrade wagtail, fix width for blog pages

---
 .idea/iamkonstantin-web.iml           | 3 ++-
 .idea/misc.xml                        | 2 +-
 iamkonstantin_web/templates/base.html | 2 +-
 requirements.txt                      | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.idea/iamkonstantin-web.iml b/.idea/iamkonstantin-web.iml
index 4a1b312..79d7ae9 100644
--- a/.idea/iamkonstantin-web.iml
+++ b/.idea/iamkonstantin-web.iml
@@ -15,8 +15,9 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/env" />
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.13 (iamkonstantin-web)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="PyDocumentationSettings">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d0b0933..6de942c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.12 (iamkonstantin-web)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12 (iamkonstantin-web)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (iamkonstantin-web)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/iamkonstantin_web/templates/base.html b/iamkonstantin_web/templates/base.html
index 48dd9f2..ab2c782 100644
--- a/iamkonstantin_web/templates/base.html
+++ b/iamkonstantin_web/templates/base.html
@@ -64,7 +64,7 @@
 <div class="relative w-full sm:px-8">
     {% include "includes/header.html" %}
 
-    <main id="main" class="mx-auto max-w-7xl px-0 md:px-4 lg:px-8">
+    <main id="main" class="mx-auto max-w-5xl px-0 md:px-4 lg:px-8">
         {% block content %}{% endblock %}
     </main>
 
diff --git a/requirements.txt b/requirements.txt
index a373c2a..69558ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-Django>=4.2,<5.1
-wagtail>=6.2.2,<6.3
+Django>=4.2,<5.2
+wagtail>=6.3,<6.4
 whitenoise>=6.6,<7.0
 wagtailcodeblock>=1.29.0.2,<2.0
 django-tailwind>=3.6.0

From 567eda282bad1d35612d563f5157391df8a6ac06 Mon Sep 17 00:00:00 2001
From: Konstantin Kostov <konstantin@headbright.be>
Date: Fri, 8 Nov 2024 09:59:19 +0100
Subject: [PATCH 2/3] bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d1735b6..32fbc0a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 .PHONY: help build publish
-VERSION = 1.2.4
+VERSION = 1.3.0
 
 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}'

From 9e63f974bde2dc17f3c30d8b30902d83dd6adca8 Mon Sep 17 00:00:00 2001
From: Konstantin Kostov <konstantin@headbright.be>
Date: Fri, 8 Nov 2024 10:26:08 +0100
Subject: [PATCH 3/3] feat: bugfix docker image by upgrading alpine and
 removing some deps

---
 .dockerignore |  1 +
 Dockerfile    | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index fa8fa40..bb246a0 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+.idea/
 # Django project
 /media/
 /static/
diff --git a/Dockerfile b/Dockerfile
index 92c6246..cc66fa1 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.11-slim-buster
+FROM python:3.12-slim
 
 # 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 --quiet --no-install-recommends \
-    build-essential \
-    libpq-dev \
-    libmariadbclient-dev \
+RUN apt-get update --yes --quiet && apt-get install --yes --no-install-recommends \
+#    build-essential \
+#    libpq-dev \
+#    libmariadbclient-dev \
     libjpeg62-turbo-dev \
     zlib1g-dev \
     libwebp-dev \