From 036817348718523dd87fffefe96041d3de23c957 Mon Sep 17 00:00:00 2001
From: ralf <rb@egroupware.org>
Date: Tue, 20 Sep 2022 11:16:03 +0200
Subject: [PATCH] build development Docker images now based on Ubuntu 22.04 and
 by default with PHP 8.1 docker-compose.yml uses now mariadb:10.6 with
 automatic upgrade enabled

---
 doc/docker/development/Dockerfile         |  4 ++--
 doc/docker/development/build.sh           |  4 ++--
 doc/docker/development/docker-compose.yml | 15 +++++++--------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/doc/docker/development/Dockerfile b/doc/docker/development/Dockerfile
index f7241bb2fe..6a896bd27d 100644
--- a/doc/docker/development/Dockerfile
+++ b/doc/docker/development/Dockerfile
@@ -3,7 +3,7 @@
 ## EGroupware development container using Ubuntu 20.04 and PHP from ondrej/php PPA
 ##
 ################################################################################
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 MAINTAINER rb@egroupware.org
 
 ARG VERSION=dev-master
@@ -89,4 +89,4 @@ EXPOSE 9000
 ADD entrypoint.sh /
 
 CMD ["php-fpm", "--nodaemonize"]
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/doc/docker/development/build.sh b/doc/docker/development/build.sh
index 49c524bffb..3dc7650aca 100755
--- a/doc/docker/development/build.sh
+++ b/doc/docker/development/build.sh
@@ -2,12 +2,12 @@
 
 REPO=egroupware
 IMAGE=development
-BASE=ubuntu:20.04
+BASE=ubuntu:22.04
 RECOMMENDED_PHP_VERSION=8.1
 
 PHP_VERSION=${1:-8.1}
 
-TAG=$(docker run --rm -i --entrypoint bash $REPO/$IMAGE:$PHP_VERSION -c "apt update && apt search php$PHP_VERSION-fpm" 2>/dev/null|grep php$PHP_VERSION-fpm|sed "s|^php$PHP_VERSION-fpm/focal[^ ]* \([78]\.[0-9]*\.[0-9]*\).*|\1|g")
+TAG=$(docker run --rm -i --entrypoint bash $REPO/$IMAGE:$PHP_VERSION -c "apt update && apt search php$PHP_VERSION-fpm" 2>/dev/null|grep php$PHP_VERSION-fpm|sed "s|^php$PHP_VERSION-fpm/focal[^ ]* .*\([78]\.[0-9]*\.[0-9]*\).*|\1|g")
 test -z "$TAG" && {
 	echo "Can't get new tag of $REPO/$IMAGE container --> existing"
 	exit 1
diff --git a/doc/docker/development/docker-compose.yml b/doc/docker/development/docker-compose.yml
index 312ed2dae7..eeaa23f0ef 100644
--- a/doc/docker/development/docker-compose.yml
+++ b/doc/docker/development/docker-compose.yml
@@ -102,14 +102,12 @@ services:
     #
     # extra non-default apps (need to start with EGW_EXTRA_APP!)
     #
-    # new push server not yet in composer.json
-    - EGW_EXTRA_APP_PUSH=https://github.com/EGroupware/swoolepush.git
     # EPL apps (need extra credentials!)
     #- EGW_EXTRA_APPS_EPL=https://github.com/EGroupwareGmbH/epl.git https://github.com/EGroupwareGmbH/esyncpro.git https://github.com/EGroupwareGmbH/policy.git https://github.com/EGroupwareGmbH/webauthn.git
     # old Wiki
-    - EGW_EXTRA_APP_WIKI=https://github.com/EGroupware/wiki.git
-    # old API and eTemplate(1)
-    - EGW_EXTRA_APP_OLDAPI=https://github.com/EGroupware/phpgwapi.git https://github.com/EGroupware/etemplate.git
+    #- EGW_EXTRA_APP_WIKI=https://github.com/EGroupware/wiki.git
+    # old API and eTemplate(1), required for upgrades from before 14.3
+    #- EGW_EXTRA_APP_OLDAPI=https://github.com/EGroupware/phpgwapi.git https://github.com/EGroupware/etemplate.git
     #
     # XDEBUG_REMOTE_HOST need to be set, if the host running the IDE is different from 172.17.0.1 (Mac can use docker.for.mac.localhost)
     - XDEBUG_REMOTE_HOST=docker.for.mac.localhost
@@ -146,12 +144,13 @@ services:
     container_name: egroupware-nginx
     restart: always
 
-  # run an own MariaDB:10.5 (you can use EGroupware's database backup and restore to add your existing database)
+  # run an own MariaDB:10.6 (you can use EGroupware's database backup and restore to add your existing database)
   db:
-    image: mariadb:10.5
+    image: mariadb:10.6
     environment:
     #- MYSQL_ROOT=root
     - MYSQL_ROOT_PASSWORD=secret
+    - MARIADB_AUTO_UPGRADE=true
     volumes:
     - db:/var/lib/mysql
     # to add an own persistent configuration
@@ -283,4 +282,4 @@ services:
 #    volumes:
 #      - /var/run/docker.sock:/var/run/docker.sock
 #      - portainer_data:/data
-#    container_name: portainer
+#    container_name: portainer
\ No newline at end of file