diff --git a/composer.json b/composer.json index 501b78036c118becc67533614b9ffef14e69a4f9..db42315cf38decd4af085c072b21261fba4f98a1 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,11 @@ "platform": { "php": "7.2" }, - "process-timeout": 0 + "process-timeout": 0, + "allow-plugins": { + "laminas/laminas-dependency-plugin": true, + "wikimedia/composer-merge-plugin": true + } }, "require": { "php": ">=7.2", diff --git a/composer.lock b/composer.lock index 8cd0393223859d61d5c20f31b61db7ec54ebb3e4..9ee3508c39bcbdf74b7ff31e9229ffd081ee79af 100644 --- a/composer.lock +++ b/composer.lock @@ -2682,6 +2682,14 @@ "resources", "translations" ], + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-i18n-resources/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-i18n-resources/issues", + "rss": "https://github.com/laminas/laminas-i18n-resources/releases.atom", + "source": "https://github.com/laminas/laminas-i18n-resources" + }, "time": "2019-12-31T17:11:35+00:00" }, { @@ -5869,6 +5877,11 @@ "jCard", "vCard" ], + "support": { + "forum": "https://groups.google.com/group/sabredav-discuss", + "issues": "https://github.com/sabre-io/vobject/issues", + "source": "https://github.com/fruux/sabre-vobject" + }, "time": "2016-10-07T03:20:40+00:00" }, { @@ -6340,6 +6353,23 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v3.4.47" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-10-24T10:57:07+00:00" }, { @@ -10836,5 +10866,6 @@ "platform-dev": [], "platform-overrides": { "php": "7.2" - } + }, + "plugin-api-version": "2.3.0" } diff --git a/devops/docker/composer/Dockerfile b/devops/docker/composer/Dockerfile index 6bb77fbecc8f6704bf4c9f8724ac6ad3ff7d5909..f17777c477a159266f5f047d470584416e90e474 100644 --- a/devops/docker/composer/Dockerfile +++ b/devops/docker/composer/Dockerfile @@ -16,7 +16,7 @@ # @author Sebastian Kehr <kehr@ub.uni-leipzig.de> # @license https://opensource.org/licenses/GPL-3.0 GNU GPLv3 -FROM composer:1.9.3 +FROM composer:2.5.8 RUN apk add --no-cache freetype-dev libxml2-dev icu-dev \ && docker-php-ext-install gd \ && docker-php-ext-install soap \ diff --git a/devops/docker/composer/entrypoint.sh b/devops/docker/composer/entrypoint.sh index 2be4334579feb7885945cc8e1628595584fd55f3..041fc1a907e5feb803525fbf0ec759506f6c143c 100755 --- a/devops/docker/composer/entrypoint.sh +++ b/devops/docker/composer/entrypoint.sh @@ -26,6 +26,8 @@ fi until ! (ping -c1 env >/dev/null 2>&1) && [ -f ./data/docker/env/composer ]; do :; done set -a; . ./data/docker/env/composer; set +a +composer --version + : "${UIDGID:=$(stat -c '%u' .):$(stat -c '%g' .)}" echo "php:x:$UIDGID:php:$(pwd):/bin/sh" >> /etc/passwd chown "$UIDGID" "$(command -v composer)"