diff --git a/doc/docker/development/Dockerfile b/doc/docker/development/Dockerfile index 19c1943ab4..344e70f42e 100644 --- a/doc/docker/development/Dockerfile +++ b/doc/docker/development/Dockerfile @@ -7,7 +7,7 @@ FROM ubuntu:20.04 MAINTAINER rb@egroupware.org ARG VERSION=dev-master -ARG PHP_VERSION=7.3 +ARG PHP_VERSION=7.4 # keeping build-arg in environment for entrypoint.sh ENV VERSION=$VERSION @@ -50,6 +50,11 @@ RUN apt-get update \ && ln -s /dev/stderr /var/log/php$PHP_VERSION-fpm.log \ # install tools to build EGroupware && apt-get install -y rsync npm zip curl sudo cron patch \ + # install nodesource repo for nodejs 14.x + && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add - \ + && echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | tee /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ + && apt-get install -y nodejs \ && npm install -g grunt-cli \ && bash -c \ 'EXPECTED_SIGNATURE=$(curl https://composer.github.io/installer.sig); \ diff --git a/doc/docker/development/build.sh b/doc/docker/development/build.sh index 59fe993c90..1d1e541d08 100755 --- a/doc/docker/development/build.sh +++ b/doc/docker/development/build.sh @@ -3,11 +3,11 @@ REPO=egroupware IMAGE=development BASE=ubuntu:20.04 -RECOMMENDED_PHP_VERSION=7.3 +RECOMMENDED_PHP_VERSION=7.4 -PHP_VERSION=${1:-7.3} +PHP_VERSION=${1:-7.4} -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:$PHP_VERSION -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 diff --git a/doc/docker/development/entrypoint.sh b/doc/docker/development/entrypoint.sh index 7c634dd0cd..1cddfad852 100755 --- a/doc/docker/development/entrypoint.sh +++ b/doc/docker/development/entrypoint.sh @@ -2,7 +2,7 @@ set -ex VERSION=${VERSION:-dev-master} -PHP_VERSION=${PHP_VERSION:-7.3} +PHP_VERSION=${PHP_VERSION:-7.4} # if EGW_SESSION_TIMEOUT is set in environment, propagate value to php.ini test -n "$EGW_SESSION_TIMEOUT" && test "$EGW_SESSION_TIMEOUT" -ge 1440 &&