From d05d83f63246ed6e1c854c730d90f81fe50d637c Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Fri, 31 Jul 2020 17:52:11 +0200
Subject: [PATCH] * Container: use Ubuntu 20.04 as base of EGroupware container
 instead of 18.04

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

diff --git a/doc/docker/fpm/Dockerfile b/doc/docker/fpm/Dockerfile
index 59e0e3100e..a678822ba6 100644
--- a/doc/docker/fpm/Dockerfile
+++ b/doc/docker/fpm/Dockerfile
@@ -3,7 +3,7 @@
 ## EGroupware FPM container using Ubuntu 18.04 and PHP 7.3 from ondrej/php PPA
 ##
 ################################################################################
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 MAINTAINER rb@egroupware.org
 
 ARG VERSION=dev-master
@@ -74,7 +74,7 @@ exit $RESULT' \
 	&& composer.phar clear-cache \
 	&& rm -f /usr/local/bin/composer.phar \
 	&& npm uninstall -g grunt-cli \
-	&& npm cache clear \
+	&& npm cache clear --force \
 	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false npm zip \
 	&& apt-get clean \
 	# create data directory
diff --git a/doc/docker/fpm/build.sh b/doc/docker/fpm/build.sh
index d66a112e7e..7f6ce00350 100755
--- a/doc/docker/fpm/build.sh
+++ b/doc/docker/fpm/build.sh
@@ -17,7 +17,7 @@ BRANCH=$(echo $VERSION|sed 's/\.[0-9]\{8\}$//')
 
 cd $(dirname $0)
 
-docker pull ubuntu:18.04
+docker pull ubuntu:20.04
 docker build --no-cache --build-arg "VERSION=$VERSION" -t egroupware/egroupware:$TAG . && {
 	docker push egroupware/egroupware:$TAG
 	# tag only stable releases as latest