holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes for PHP 8.0 and xdebug 3.0

Browse Source
This commit is contained in:
Ralf Becker 2021-03-20 17:29:48 +01:00
parent 3b53ff960c
commit 678ce97e79
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/docker/development/Dockerfile
View File

@ -1,6 +1,6 @@
################################################################################ ################################################################################
## ##
## EGroupware FPM container using Ubuntu 18.04 and PHP from ondrej/php PPA ## EGroupware development container using Ubuntu 20.04 and PHP from ondrej/php PPA
## ##
################################################################################ ################################################################################
FROM ubuntu:20.04 FROM ubuntu:20.04
@ -17,7 +17,9 @@ RUN apt-get update \
&& apt-get install -y software-properties-common \ && apt-get install -y software-properties-common \
&& LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php \ && LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php \
&& apt-get update \ && apt-get update \
&& bash -c "apt-get install -y php$PHP_VERSION-{cli,mysql,json,gd,xsl,bz2,opcache,apcu,tidy,zip,bcmath,mbstring,smbclient,ldap,curl,fpm,pgsql,gmp}" \ && bash -c "apt-get install -y php$PHP_VERSION-{cli,mysql,gd,xsl,bz2,opcache,apcu,tidy,zip,bcmath,mbstring,smbclient,ldap,curl,fpm,pgsql,gmp}" \
# PHP 8.0 no longer has a separate json extension
&& bash -c "[ ${PHP_VERSION:0:1} = 7 ] && apt-get install -y php$PHP_VERSION-json" \
# fpm and php.ini settings # fpm and php.ini settings
&& sed -e 's/^;\?listen \?=.*/listen = 9000/g' \ && sed -e 's/^;\?listen \?=.*/listen = 9000/g' \
-e '/allowed_clients/d' \ -e '/allowed_clients/d' \
@ -68,10 +70,10 @@ exit $RESULT' \
&& echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf && echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
# install diverse developper tools, not installed above / in stock container # install diverse developper tools, not installed above / in stock container
RUN apt-get install -y php$PHP_VERSION-cli php-xdebug inetutils-ping iproute2 git vim yarn \ RUN apt-get install -y php$PHP_VERSION-cli php$PHP_VERSION-xdebug inetutils-ping iproute2 git vim yarn \
&& echo "xdebug.remote_enable=1" >> /etc/php/$PHP_VERSION/fpm/conf.d/20-xdebug.ini \ && echo "xdebug.mode=debug" >> /etc/php/$PHP_VERSION/fpm/conf.d/20-xdebug.ini \
&& echo "xdebug.remote_port=9001" >> /etc/php/$PHP_VERSION/fpm/conf.d/20-xdebug.ini \ && echo "xdebug.client_port=9001" >> /etc/php/$PHP_VERSION/fpm/conf.d/20-xdebug.ini \
&& echo "xdebug.remote_host=172.17.0.1" >> /etc/php/$PHP_VERSION/fpm/conf.d/20-xdebug.ini \ && echo "xdebug.client_host=172.17.0.1" >> /etc/php/$PHP_VERSION/fpm/conf.d/20-xdebug.ini \
&& ln -s /usr/local/bin/composer.phar /usr/local/bin/composer \ && ln -s /usr/local/bin/composer.phar /usr/local/bin/composer \
&& sed -e 's|^;\?opcache.validate_timestamps \?=.*|opcache.validate_timestamps=1|g' \ && sed -e 's|^;\?opcache.validate_timestamps \?=.*|opcache.validate_timestamps=1|g' \
-i /etc/php/$PHP_VERSION/fpm/php.ini \ -i /etc/php/$PHP_VERSION/fpm/php.ini \

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

@ -7,7 +7,7 @@ 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/focal.?*\([78]\.[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