extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 12:51:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

update development container to Ubuntu 20.04

Browse Source
This commit is contained in:
Ralf Becker 2021-03-20 16:09:26 +01:00
parent 2d1b9b744f
commit 3b53ff960c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/docker/development/Dockerfile
View File

@ -3,7 +3,7 @@
## EGroupware FPM container using Ubuntu 18.04 and PHP from ondrej/php PPA ## 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 MAINTAINER rb@egroupware.org
ARG VERSION=dev-master ARG VERSION=dev-master
@ -62,6 +62,7 @@ else \
RESULT=$?; \ RESULT=$?; \
fi; \ fi; \
rm composer-setup.php; \ rm composer-setup.php; \
composer.phar self-update 1.8.6; \
exit $RESULT' \ exit $RESULT' \
# disable certificate checks for LDAP as most LDAP and AD servers have no "valid" cert # disable certificate checks for LDAP as most LDAP and AD servers have no "valid" cert
&& echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf && echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf

4
doc/docker/development/build.sh
View File

@ -2,12 +2,12 @@
REPO=egroupware REPO=egroupware
IMAGE=development IMAGE=development
BASE=ubuntu:18.04 BASE=ubuntu:20.04
RECOMMENDED_PHP_VERSION=7.3 RECOMMENDED_PHP_VERSION=7.3
PHP_VERSION=${1:-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" && { test -z "$TAG" && {
echo "Can't get new tag of $REPO/$IMAGE container --> existing" echo "Can't get new tag of $REPO/$IMAGE container --> existing"
exit 1 exit 1