From 7072f96244041f44cc9497f4d75cde32d8a3618f Mon Sep 17 00:00:00 2001
From: ralf <rb@egroupware.org>
Date: Tue, 20 Sep 2022 13:44:54 +0200
Subject: [PATCH] building 22.1 images with PHP 8.1 on base of Ubuntu 22.04 and
 MariaDB 10.6

---
 doc/docker/docker-compose.yml | 5 +++--
 doc/docker/fpm/Dockerfile     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/docker/docker-compose.yml b/doc/docker/docker-compose.yml
index 495f5ba240..daf701be4b 100644
--- a/doc/docker/docker-compose.yml
+++ b/doc/docker/docker-compose.yml
@@ -53,7 +53,7 @@ volumes:
       device: $PWD/data/default/rocketchat/uploads
 services:
   egroupware:
-    image: egroupware/egroupware:20.1
+    image: egroupware/egroupware:22.1
     # EPL image: download.egroupware.org/egroupware/epl:20.1
     # setting a default language for a new installation
     #environment:
@@ -139,10 +139,11 @@ services:
 
   # run an own MariaDB:10.4 (you can use EGroupware's database backup and restore to add your existing database)
   db:
-    image: mariadb
+    image: mariadb:10.6
     environment:
     #- MYSQL_ROOT=root
     - MYSQL_ROOT_PASSWORD=secret
+    - MARIADB_AUTO_UPGRADE=true
     volumes:
     - db:/var/lib/mysql
     container_name: egroupware-db
diff --git a/doc/docker/fpm/Dockerfile b/doc/docker/fpm/Dockerfile
index 0ab766e49f..da0019a443 100644
--- a/doc/docker/fpm/Dockerfile
+++ b/doc/docker/fpm/Dockerfile
@@ -3,11 +3,11 @@
 ## EGroupware FPM container using Ubuntu 18.04 and PHP 7.3 from ondrej/php PPA
 ##
 ################################################################################
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 MAINTAINER rb@egroupware.org
 
 ARG VERSION=dev-master
-ARG PHP_VERSION=7.4
+ARG PHP_VERSION=8.1
 
 # keeping build-arg in environment for entrypoint.sh
 ENV VERSION=$VERSION