diff --git a/doc/docker/fpm/Dockerfile b/doc/docker/fpm/Dockerfile index b395d3dfb2..af7bf66dea 100644 --- a/doc/docker/fpm/Dockerfile +++ b/doc/docker/fpm/Dockerfile @@ -69,6 +69,7 @@ rm composer-setup.php; \ exit $RESULT' \ # build EGroupware && cd /usr/share \ + && composer.phar self-update 1.8.6 \ && composer.phar create-project --prefer-dist --no-scripts --no-dev egroupware/egroupware:$VERSION \ && cd egroupware \ && npm install \ diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php index 05f3046ef3..b48990a532 100755 --- a/doc/rpm-build/checkout-build-archives.php +++ b/doc/rpm-build/checkout-build-archives.php @@ -18,7 +18,7 @@ date_default_timezone_set('Europe/Berlin'); // to get ride of 5.3 warnings $verbose = 0; $config = array( 'packagename' => 'egroupware-docker', - 'version' => '20.1', // '20.1' + 'version' => '21.1', 'packaging' => date('Ymd'), // '20160520' 'branch' => 'master', // checked out branch 'tag' => '$version.$packaging', // name of tag @@ -34,7 +34,7 @@ $config = array( 'extra' => array('$stylitebase/$svnbranch/stylite', '$stylitebase/$svnbranch/esyncpro'), //'$stylitebase/trunk/archive'),//, '$stylitebase/$svnbranch/groups'), //,'svn+ssh://stylite@svn.stylite.de/stylite/trunk/eventmgr'), */ // create an extra archive for given apps - 'extra' => array('functions' => array('stylite'), 'esyncpro', 'policy', 'webauthn', //'archive', + 'extra' => array('functions' => array('stylite'), 'esyncpro', 'policy', 'webauthn', 'kanban', // these apps are placed in egroupware-epl-contrib archive //'contrib' => array('phpgwapi', 'etemplate', 'jdots', 'phpbrain', 'wiki', 'sitemgr') ),