From 283bc80b410d5d2d60dcfe758cee39de2541b255 Mon Sep 17 00:00:00 2001
From: Stefan Bethke <stb@lassitu.de>
Date: Sun, 26 Jul 2026 00:47:54 +0200
Subject: [PATCH 1/2] Update wordpress image

---
 inventories/chaosknoten/host_vars/ccchoir.yaml               | 3 +++
 resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/inventories/chaosknoten/host_vars/ccchoir.yaml b/inventories/chaosknoten/host_vars/ccchoir.yaml
index 7b7d572..6bd3091 100644
--- a/inventories/chaosknoten/host_vars/ccchoir.yaml
+++ b/inventories/chaosknoten/host_vars/ccchoir.yaml
@@ -12,3 +12,6 @@ nginx__version_spec: ""
 nginx__configurations:
   - name: ccchoir.de
     content: "{{ lookup('ansible.builtin.file', 'resources/chaosknoten/ccchoir/nginx/ccchoir.de.conf') }}"
+
+# renovate: datasource=docker depName=docker.io/library/wordpress
+host_ccchoir__docker_compose__wordpress_version: 7.0.2-apache
diff --git a/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2 b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2
index c2108d8..72d898f 100644
--- a/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/ccchoir/docker_compose/compose.yaml.j2
@@ -17,7 +17,7 @@ services:
     restart: unless-stopped
 
   app:
-    image: docker.io/library/wordpress:6-php8.1
+    image: docker.io/library/wordpress:7-php8.2
     environment:
       - "WORDPRESS_DB_HOST=database"
       - "WORDPRESS_DB_NAME=wordpress"

From 9e0f97d3da8c4018a54d3254630220a44fe8985d Mon Sep 17 00:00:00 2001
From: Renovate <no-reply@git.hamburg.ccc.de>
Date: Sat, 25 Jul 2026 23:01:23 +0000
Subject: [PATCH 2/2] Update docker.io/library/postgres Docker tag to v18

---
 inventories/chaosknoten/host_vars/cloud.yaml                 | 2 +-
 resources/chaosknoten/lists/docker_compose/compose.yaml.j2   | 2 +-
 resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inventories/chaosknoten/host_vars/cloud.yaml b/inventories/chaosknoten/host_vars/cloud.yaml
index 8f299b2..4f797e6 100644
--- a/inventories/chaosknoten/host_vars/cloud.yaml
+++ b/inventories/chaosknoten/host_vars/cloud.yaml
@@ -1,7 +1,7 @@
 # renovate: datasource=docker depName=git.hamburg.ccc.de/ccchh/oci-images/nextcloud
 nextcloud__version: 34
 # renovate: datasource=docker depName=docker.io/library/postgres
-nextcloud__postgres_version: 15.18
+nextcloud__postgres_version: 18.4
 nextcloud__fqdn: cloud.hamburg.ccc.de
 nextcloud__data_dir: /data/nextcloud
 nextcloud__extra_configuration: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/cloud/nextcloud/extra_configuration.config.php.j2') }}"
diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
index db605b5..58d1ed5 100644
--- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2
@@ -62,7 +62,7 @@ services:
       - POSTGRES_DB=mailmandb
       - POSTGRES_USER=mailman
       - "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}"
-    image: docker.io/library/postgres:12-alpine
+    image: docker.io/library/postgres:18-alpine
     volumes:
       - /opt/mailman/database:/var/lib/postgresql/data
     networks:
diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
index dea2dfb..ccc49ba 100644
--- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
+++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2
@@ -3,7 +3,7 @@
 
 services:
   database:
-    image: docker.io/library/postgres:15-alpine
+    image: docker.io/library/postgres:18-alpine
     environment:
       - "POSTGRES_USER=pretalx"
       - "POSTGRES_PASSWORD={{ secret__pretalx_db_password }}"