From 881d086c490937b7ed589c48601e4eb516cff665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1nos=20Mik=C3=B3?= Date: Tue, 3 Dec 2024 09:07:40 +0100 Subject: [PATCH] chore: fix composer path for php-fpm images --- .../php-fpm/base/context/rootfs/docker-entrypoint.sh | 10 +++++----- .../magento2-web/context/rootfs/docker-entrypoint.sh | 10 +++++----- .../shopware-web/context/rootfs/docker-entrypoint.sh | 10 +++++----- .../wordpress-web/context/rootfs/docker-entrypoint.sh | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/images/php-fpm/base/context/rootfs/docker-entrypoint.sh b/images/php-fpm/base/context/rootfs/docker-entrypoint.sh index 7006be4a..0a5d0847 100755 --- a/images/php-fpm/base/context/rootfs/docker-entrypoint.sh +++ b/images/php-fpm/base/context/rootfs/docker-entrypoint.sh @@ -123,23 +123,23 @@ configure_composer_version() { case "${COMPOSER_VERSION:-}" in "1") - sudo alternatives --set composer "${HOME}/.local/bin/composer1" + sudo alternatives --set composer "/usr/local/bin/composer1" sudo composer self-update --1 ;; "2") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --2 ;; "2.2") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --2.2 ;; "stable") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --stable ;; *) - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update "${COMPOSER_VERSION:-}" ;; esac diff --git a/images/php-fpm/magento2-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm/magento2-web/context/rootfs/docker-entrypoint.sh index db593d64..942cdae4 100755 --- a/images/php-fpm/magento2-web/context/rootfs/docker-entrypoint.sh +++ b/images/php-fpm/magento2-web/context/rootfs/docker-entrypoint.sh @@ -163,23 +163,23 @@ configure_composer_version() { case "${COMPOSER_VERSION:-}" in "1") - sudo alternatives --set composer "${HOME}/.local/bin/composer1" + sudo alternatives --set composer "/usr/local/bin/composer1" sudo composer self-update --1 ;; "2") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --2 ;; "2.2") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --2.2 ;; "stable") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --stable ;; *) - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update "${COMPOSER_VERSION:-}" ;; esac diff --git a/images/php-fpm/shopware-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm/shopware-web/context/rootfs/docker-entrypoint.sh index e5160d4b..80ae3f14 100755 --- a/images/php-fpm/shopware-web/context/rootfs/docker-entrypoint.sh +++ b/images/php-fpm/shopware-web/context/rootfs/docker-entrypoint.sh @@ -163,23 +163,23 @@ configure_composer_version() { case "${COMPOSER_VERSION:-}" in "1") - sudo alternatives --set composer "${HOME}/.local/bin/composer1" + sudo alternatives --set composer "/usr/local/bin/composer1" sudo composer self-update --1 ;; "2") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --2 ;; "2.2") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --2.2 ;; "stable") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --stable ;; *) - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update "${COMPOSER_VERSION:-}" ;; esac diff --git a/images/php-fpm/wordpress-web/context/rootfs/docker-entrypoint.sh b/images/php-fpm/wordpress-web/context/rootfs/docker-entrypoint.sh index e5160d4b..80ae3f14 100755 --- a/images/php-fpm/wordpress-web/context/rootfs/docker-entrypoint.sh +++ b/images/php-fpm/wordpress-web/context/rootfs/docker-entrypoint.sh @@ -163,23 +163,23 @@ configure_composer_version() { case "${COMPOSER_VERSION:-}" in "1") - sudo alternatives --set composer "${HOME}/.local/bin/composer1" + sudo alternatives --set composer "/usr/local/bin/composer1" sudo composer self-update --1 ;; "2") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --2 ;; "2.2") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --2.2 ;; "stable") - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update --stable ;; *) - sudo alternatives --set composer "${HOME}/.local/bin/composer2" + sudo alternatives --set composer "/usr/local/bin/composer2" sudo composer self-update "${COMPOSER_VERSION:-}" ;; esac