diff --git a/docker/roundcube/rootfs/opt/app-root/src/build.sh b/docker/roundcube/rootfs/opt/app-root/src/build.sh index 540f2f27..66ee2882 100755 --- a/docker/roundcube/rootfs/opt/app-root/src/build.sh +++ b/docker/roundcube/rootfs/opt/app-root/src/build.sh @@ -1,56 +1,55 @@ #!/bin/bash set -e set -x pushd /opt/app-root/src/ # Clone what we don't find (roundcubemail-skin-elastic is not publicly available, so can't be included this way) if [ ! -d roundcubemail ]; then git clone --branch $GIT_REF_ROUNDCUBEMAIL $GIT_REMOTE_ROUNDCUBEMAIL roundcubemail fi + if [ ! -d roundcubemail-plugins-kolab ]; then git clone --branch $GIT_REF_ROUNDCUBEMAIL_PLUGINS $GIT_REMOTE_ROUNDCUBEMAIL_PLUGINS roundcubemail-plugins-kolab fi if [ ! -d syncroton ]; then git clone --branch $GIT_REF_SYNCROTON $GIT_REMOTE_SYNCROTON syncroton fi if [ ! -d iRony ]; then git clone --branch $GIT_REF_IRONY $GIT_REMOTE_IRONY iRony fi if [ ! -d chwala ]; then git clone --branch $GIT_REF_CHWALA $GIT_REMOTE_CHWALA chwala fi if [ ! -d autoconf ]; then git clone --branch $GIT_REF_AUTOCONF $GIT_REMOTE_AUTOCONF autoconf fi if [ ! -d freebusy ]; then git clone --branch $GIT_REF_FREEBUSY $GIT_REMOTE_FREEBUSY freebusy fi - pushd roundcubemail cp /opt/app-root/src/composer.json composer.json rm -rf vendor/ composer.lock -php -dmemory_limit=-1 $(command -v composer) install +env COMPOSER_ALLOW_SUPERUSER=1 php -dmemory_limit=-1 $(command -v composer) install +popd -cd /opt/app-root/src/ ./update.sh -cd /opt/app-root/src/roundcubemail +pushd roundcubemail # Adjust the configs - sed -i -r \ -e "s/'vlv'(\s+)=> false,/'vlv'\1=> true,/g" \ -e "s/'vlv_search'(\s+)=> false,/'vlv_search'\1=> true,/g" \ -e "s/inetOrgPerson/inetorgperson/g" \ -e "s/kolabInetOrgPerson/inetorgperson/g" \ config/*.inc.php sed -i -r -e "s|\$config\['managesieve_host'\] = .*$|\$config['managesieve_host'] = 'kolab';|g" config/managesieve.inc.php popd # Set the php timezone sed -i -r -e 's|^(;*)date\.timezone.*$|date.timezone = Europe/Zurich|g' /etc/php.ini # Allow environment variables from fpm sed -i -e "s/;clear_env/clear_env/" /etc/php-fpm.d/www.conf diff --git a/docker/roundcube/rootfs/opt/app-root/src/composer.json b/docker/roundcube/rootfs/opt/app-root/src/composer.json index 5947c41a..ba184e04 100755 --- a/docker/roundcube/rootfs/opt/app-root/src/composer.json +++ b/docker/roundcube/rootfs/opt/app-root/src/composer.json @@ -1,180 +1,181 @@ { "name": "kolab/roundcubemail", "description": "The Roundcube Webmail suite", "license": "GPL-3.0+", "version": "1.5.3", "config": { "platform": { - "php": "7.2.24" + "php": "8.0.30" }, "allow-plugins": { "roundcube/plugin-installer": true } }, "repositories": [ { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_activesync", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_addressbook", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_auth", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_config", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_delegation", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_files", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_folders", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_notes", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_tags", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_chat", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/odfviewer", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/pdfviewer", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/tasklist", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/calendar", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/libcalendaring", "options": { "symlink": false } }, { "type": "path", "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/libkolab", "options": { "symlink": false } }, { "type": "composer", "url": "https://plugins.roundcube.net" } ], "require": { - "php": ">=7.2.0", + "php": ">=7.3.0", + "caxy/php-htmldiff": "~0.1.15", "pear/pear-core-minimal": "~1.10.1", "pear/auth_sasl": "~1.1.0", "pear/mail_mime": "~1.10.0", "pear/http_request2": "~2.5.0", "pear/net_smtp": "~1.10.0", "pear/crypt_gpg": "~1.6.3", "pear/net_sieve": "~1.4.5", "roundcube/plugin-installer": "~0.2.0", "roundcube/rtf-html-php": "~2.1", "masterminds/html5": "~2.7.0", "endroid/qr-code": "~1.6.5", "guzzlehttp/guzzle": "^7.4.1", "kolab/calendar": "~3.5.11", "kolab/kolab_activesync": "~3.5.6", "kolab/kolab_addressbook": "~3.5.6", "kolab/kolab_auth": "~3.5.6", "kolab/kolab_chat": "~3.5.2", "kolab/kolab_config": "~3.4.0", "kolab/kolab_delegation": "~3.5.11", "kolab/kolab_files": "~3.5.2", "kolab/kolab_folders": "~3.5.2", "kolab/kolab_notes": "~3.5.5", "kolab/kolab_tags": "~3.5.2", "kolab/net_ldap3": "dev-master", "kolab/odfviewer": "~3.4.0", "kolab/pdfviewer": "~3.4.0", "kolab/tasklist": "~3.5.10", "johndoh/contextmenu": "~3.2.1", "zf1/zend-json": "~1.12.11", "zf1/zend-log": "~1.12.11", "zf1/zend-controller": "~1.12.11", "sabre/vobject" : "~4.5.1", "sabre/dav" : "~4.0", "sabre/http" : "~5.0", "smarty/smarty" : "~3.1.7" }, "require-dev": { "phpunit/phpunit": "^8 || ^9", "phpstan/phpstan": "^1.4", "squizlabs/php_codesniffer": "^3.6", "friendsofphp/php-cs-fixer": "^3.0", "phpcompatibility/php-compatibility": "^9.3" }, "suggest": { "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver" } }