From 3b53ff960cd007ec6a34b243ab9bf2a48cd2ce03 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Sat, 20 Mar 2021 16:09:26 +0100
Subject: [PATCH] update development container to Ubuntu 20.04

---
 doc/docker/development/Dockerfile | 3 ++-
 doc/docker/development/build.sh   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/docker/development/Dockerfile b/doc/docker/development/Dockerfile
index babf3c7f75..1057af061c 100644
--- a/doc/docker/development/Dockerfile
+++ b/doc/docker/development/Dockerfile
@@ -3,7 +3,7 @@
 ## EGroupware FPM container using Ubuntu 18.04 and PHP from ondrej/php PPA
 ##
 ################################################################################
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER rb@egroupware.org
 
 ARG VERSION=dev-master
@@ -62,6 +62,7 @@ else \
 	RESULT=$?; \
 fi; \
 rm composer-setup.php; \
+composer.phar self-update 1.8.6; \
 exit $RESULT' \
 	# disable certificate checks for LDAP as most LDAP and AD servers have no "valid" cert
 	&& echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
diff --git a/doc/docker/development/build.sh b/doc/docker/development/build.sh
index c9888d5ecd..c7a605c8e3 100755
--- a/doc/docker/development/build.sh
+++ b/doc/docker/development/build.sh
@@ -2,12 +2,12 @@
 
 REPO=egroupware
 IMAGE=development
-BASE=ubuntu:18.04
+BASE=ubuntu:20.04
 RECOMMENDED_PHP_VERSION=7.3
 
 PHP_VERSION=${1:-7.3}
 
-TAG=$(docker run --rm -i --entrypoint bash $REPO/$IMAGE -c "apt update && apt search php$PHP_VERSION-fpm" 2>/dev/null|grep php$PHP_VERSION-fpm|sed "s|^php$PHP_VERSION-fpm/bionic.?*\(7\.[0-9]*\.[0-9]*\).*|\1|g")
+TAG=$(docker run --rm -i --entrypoint bash $REPO/$IMAGE -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