From 59a5d9abc9f4229195e48463a960129ea92af21a Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <elberfeld@web.de>
Date: Sat, 17 Dec 2022 23:57:38 +0100
Subject: [PATCH] Upgrade services

---
 webserver/docker_dokuwiki/templates/Dockerfile                | 3 ++-
 webserver/docker_gitlab/templates/docker-compose.yml          | 2 +-
 webserver/docker_hackmd/templates/docker-compose.yml          | 2 +-
 webserver/docker_icinga/templates/Dockerfile                  | 2 +-
 webserver/docker_matrix/templates/docker-compose.yml          | 4 ++--
 .../docker_matrix/templates/synapse-data/homeserver.yaml      | 1 +
 webserver/docker_wordpress/templates/Dockerfile               | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/webserver/docker_dokuwiki/templates/Dockerfile b/webserver/docker_dokuwiki/templates/Dockerfile
index c7a01f30..7af4c0db 100644
--- a/webserver/docker_dokuwiki/templates/Dockerfile
+++ b/webserver/docker_dokuwiki/templates/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.4.27-apache-buster
+FROM php:7.4.33-apache-bullseye
 
 # php-gd modul für dw2pdf plugin
 RUN apt-get update && apt-get install -y \
@@ -14,6 +14,7 @@ RUN touch /usr/local/etc/php/conf.d/uploads.ini \
     && echo "upload_max_filesize = 10M;" >> /usr/local/etc/php/conf.d/uploads.ini \
     && echo "post_max_size = 10M;" >> /usr/local/etc/php/conf.d/uploads.ini
 
+
 # Configure LDAP.
 RUN apt-get update \
  && apt-get install libldap2-dev -y \
diff --git a/webserver/docker_gitlab/templates/docker-compose.yml b/webserver/docker_gitlab/templates/docker-compose.yml
index d0509756..8bc6ec56 100644
--- a/webserver/docker_gitlab/templates/docker-compose.yml
+++ b/webserver/docker_gitlab/templates/docker-compose.yml
@@ -5,7 +5,7 @@ services:
 
   app:
 
-    image: gitlab/gitlab-ce:15.0.2-ce.0
+    image: gitlab/gitlab-ce:15.6.2-ce.0
     restart: always
     ports:
       - "444:22"
diff --git a/webserver/docker_hackmd/templates/docker-compose.yml b/webserver/docker_hackmd/templates/docker-compose.yml
index bd28a1d7..83640ce2 100644
--- a/webserver/docker_hackmd/templates/docker-compose.yml
+++ b/webserver/docker_hackmd/templates/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
 
   app:
-    image: quay.io/hedgedoc/hedgedoc:1.9.2-debian
+    image: quay.io/hedgedoc/hedgedoc:1.9.6-debian
     restart: always
     depends_on:
       - db
diff --git a/webserver/docker_icinga/templates/Dockerfile b/webserver/docker_icinga/templates/Dockerfile
index d975f044..62cf7875 100644
--- a/webserver/docker_icinga/templates/Dockerfile
+++ b/webserver/docker_icinga/templates/Dockerfile
@@ -1,4 +1,4 @@
-FROM jordan/icinga2:2.13.2
+FROM jordan/icinga2:2.13.5
 
 # Install additional Packages
 RUN apt-get update \
diff --git a/webserver/docker_matrix/templates/docker-compose.yml b/webserver/docker_matrix/templates/docker-compose.yml
index b35d257b..78a3e274 100644
--- a/webserver/docker_matrix/templates/docker-compose.yml
+++ b/webserver/docker_matrix/templates/docker-compose.yml
@@ -24,7 +24,7 @@ services:
 
   synapse:
 
-    image: matrixdotorg/synapse:v1.52.0
+    image: matrixdotorg/synapse:v1.73.0
     restart: always
     cpu_count: "1"
     cpuset: "0"
@@ -34,7 +34,7 @@ services:
     volumes:
       - /srv/matrix/synapse-data/:/data
       # Python version can be found in the dockerfile: https://github.com/matrix-org/synapse/blob/develop/docker/Dockerfile check for tag to get the correct version
-      - /srv/matrix/rest_auth_provider.py:/usr/local/lib/python3.8/site-packages/rest_auth_provider.py
+      - /srv/matrix/rest_auth_provider.py:/usr/local/lib/python3.9/site-packages/rest_auth_provider.py
     environment:
       SYNAPSE_CONFIG_PATH: "/data/homeserver.yaml"
       TZ: "Europe/Berlin"
diff --git a/webserver/docker_matrix/templates/synapse-data/homeserver.yaml b/webserver/docker_matrix/templates/synapse-data/homeserver.yaml
index 5ad3ffdd..94ac867e 100644
--- a/webserver/docker_matrix/templates/synapse-data/homeserver.yaml
+++ b/webserver/docker_matrix/templates/synapse-data/homeserver.yaml
@@ -89,6 +89,7 @@ report_stats: false
 
 signing_key_path: "/data/homeserver.signing.key"
 key_refresh_interval: 1d
+suppress_key_server_warning: true
 trusted_key_servers:
   - server_name: "matrix.org"
 
diff --git a/webserver/docker_wordpress/templates/Dockerfile b/webserver/docker_wordpress/templates/Dockerfile
index 0756b9d1..36579bd8 100644
--- a/webserver/docker_wordpress/templates/Dockerfile
+++ b/webserver/docker_wordpress/templates/Dockerfile
@@ -1,4 +1,4 @@
-FROM wordpress:5.9.0-php8.1-apache
+FROM wordpress:6.1.1-php8.2-apache
 
 # install the PHP extensions we need
 RUN set -x \
-- 
GitLab