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

changes for 21.1 builds (out of master)

Browse Source
This commit is contained in:
Ralf Becker 2021-03-16 09:30:34 +02:00
parent 2aa52a43c8
commit ddda3b4165
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/docker/fpm/Dockerfile
View File

@ -69,6 +69,7 @@ rm composer-setup.php; \
exit $RESULT' \ exit $RESULT' \
# build EGroupware # build EGroupware
&& cd /usr/share \ && cd /usr/share \
&& composer.phar self-update 1.8.6 \
&& composer.phar create-project --prefer-dist --no-scripts --no-dev egroupware/egroupware:$VERSION \ && composer.phar create-project --prefer-dist --no-scripts --no-dev egroupware/egroupware:$VERSION \
&& cd egroupware \ && cd egroupware \
&& npm install \ && npm install \

4
doc/rpm-build/checkout-build-archives.php
View File

@ -18,7 +18,7 @@ date_default_timezone_set('Europe/Berlin'); // to get ride of 5.3 warnings
$verbose = 0; $verbose = 0;
$config = array( $config = array(
'packagename' => 'egroupware-docker', 'packagename' => 'egroupware-docker',
'version' => '20.1', // '20.1' 'version' => '21.1',
'packaging' => date('Ymd'), // '20160520' 'packaging' => date('Ymd'), // '20160520'
'branch' => 'master', // checked out branch 'branch' => 'master', // checked out branch
'tag' => '$version.$packaging', // name of tag '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'), '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 // 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 // these apps are placed in egroupware-epl-contrib archive
//'contrib' => array('phpgwapi', 'etemplate', 'jdots', 'phpbrain', 'wiki', 'sitemgr') //'contrib' => array('phpgwapi', 'etemplate', 'jdots', 'phpbrain', 'wiki', 'sitemgr')
), ),