mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
update development container to Ubuntu 20.04
This commit is contained in:
parent
2d1b9b744f
commit
3b53ff960c
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user