extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

change PHP version to 7.4 and build with nodejs 14.x

Browse Source
This commit is contained in:
Ralf Becker 2021-07-09 14:23:58 +02:00
parent 65502ace6e
commit eef78fd58a
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/docker/development/Dockerfile
View File

@ -7,7 +7,7 @@ FROM ubuntu:20.04
MAINTAINER rb@egroupware.org MAINTAINER rb@egroupware.org
ARG VERSION=dev-master ARG VERSION=dev-master
ARG PHP_VERSION=7.3 ARG PHP_VERSION=7.4
# keeping build-arg in environment for entrypoint.sh # keeping build-arg in environment for entrypoint.sh
ENV VERSION=$VERSION ENV VERSION=$VERSION
@ -50,6 +50,11 @@ RUN apt-get update \
&& ln -s /dev/stderr /var/log/php$PHP_VERSION-fpm.log \ && ln -s /dev/stderr /var/log/php$PHP_VERSION-fpm.log \
# install tools to build EGroupware # install tools to build EGroupware
&& apt-get install -y rsync npm zip curl sudo cron patch \ && 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 \ && npm install -g grunt-cli \
&& bash -c \ && bash -c \
'EXPECTED_SIGNATURE=$(curl https://composer.github.io/installer.sig); \ 'EXPECTED_SIGNATURE=$(curl https://composer.github.io/installer.sig); \

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

@ -3,11 +3,11 @@
REPO=egroupware REPO=egroupware
IMAGE=development IMAGE=development
BASE=ubuntu:20.04 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" && { 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

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

@ -2,7 +2,7 @@
set -ex set -ex
VERSION=${VERSION:-dev-master} 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 # if EGW_SESSION_TIMEOUT is set in environment, propagate value to php.ini
test -n "$EGW_SESSION_TIMEOUT" && test "$EGW_SESSION_TIMEOUT" -ge 1440 && test -n "$EGW_SESSION_TIMEOUT" && test "$EGW_SESSION_TIMEOUT" -ge 1440 &&