* Container: use Ubuntu 20.04 as base of EGroupware container instead of 18.04

This commit is contained in:
Ralf Becker 2020-07-31 17:52:11 +02:00
parent 3972abdf52
commit 421bda29c4
2 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@
## EGroupware FPM container using Ubuntu 18.04 and PHP 7.3 from ondrej/php PPA ## 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 MAINTAINER rb@egroupware.org
ARG VERSION=dev-master ARG VERSION=dev-master
@ -74,7 +74,7 @@ exit $RESULT' \
&& composer.phar clear-cache \ && composer.phar clear-cache \
&& rm -f /usr/local/bin/composer.phar \ && rm -f /usr/local/bin/composer.phar \
&& npm uninstall -g grunt-cli \ && 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 purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false npm zip \
&& apt-get clean \ && apt-get clean \
# create data directory # create data directory

View File

@ -17,7 +17,7 @@ BRANCH=$(echo $VERSION|sed 's/\.[0-9]\{8\}$//')
cd $(dirname $0) 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 build --no-cache --build-arg "VERSION=$VERSION" -t egroupware/egroupware:$TAG . && {
docker push egroupware/egroupware:$TAG docker push egroupware/egroupware:$TAG
# tag only stable releases as latest # tag only stable releases as latest