From: Thomas Bruederli <redacted>
Date: Mon, 3 Jan 2022 20:16:39 +0000 (+0100)
Subject: Replace composer.pahr call with the binary in /usr/bin
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=6bcfc3d9dcb37324fdf4bbf719bd26433ce16499;p=roundcube-roundcubemail-docker.git

Replace composer.pahr call with the binary in /usr/bin

fixes #163
---

diff --git a/README.md b/README.md
index 4b316cf..4265cdb 100644
--- a/README.md
+++ b/README.md
@@ -99,11 +99,11 @@ For example, it may be used to increase the PHP memory limit (`memory_limit=128M
 ## Installing Roundcube Plugins
 
 With the latest updates, the Roundcube images contain the [Composer](https://getcomposer.org) binary
-which is used to install plugins. You can add and activate plugins by executing `composer.phar require <package-name>` 
+which is used to install plugins. You can add and activate plugins by executing `composer require <package-name>` 
 inside a running Roundcube container:
 
 ```
-$ docker exec -it roundcubemail composer.phar require johndoh/contextmenu --update-no-dev
+$ docker exec -it roundcubemail composer require johndoh/contextmenu --update-no-dev
 ```
 
 If you have mounted the container's volume `/var/www/html` the plugins installed persist on your host system. Otherwise they need to be (re-)installed every time you update or restart the Roundcube container.
diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index 38c1a77..50afaa6 100755
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -18,7 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     INSTALLDIR=`pwd`
     echo >&2 "roundcubemail found in $INSTALLDIR - installing update..."
     (cd /usr/src/roundcubemail && bin/installto.sh -y $INSTALLDIR)
-    composer.phar update --no-dev
+    composer update --no-dev
   fi
 
   if [ -f /run/secrets/roundcube_db_user ]; then
diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
index 38c1a77..50afaa6 100755
--- a/fpm-alpine/docker-entrypoint.sh
+++ b/fpm-alpine/docker-entrypoint.sh
@@ -18,7 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     INSTALLDIR=`pwd`
     echo >&2 "roundcubemail found in $INSTALLDIR - installing update..."
     (cd /usr/src/roundcubemail && bin/installto.sh -y $INSTALLDIR)
-    composer.phar update --no-dev
+    composer update --no-dev
   fi
 
   if [ -f /run/secrets/roundcube_db_user ]; then
diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index 38c1a77..50afaa6 100755
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -18,7 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     INSTALLDIR=`pwd`
     echo >&2 "roundcubemail found in $INSTALLDIR - installing update..."
     (cd /usr/src/roundcubemail && bin/installto.sh -y $INSTALLDIR)
-    composer.phar update --no-dev
+    composer update --no-dev
   fi
 
   if [ -f /run/secrets/roundcube_db_user ]; then
diff --git a/templates/docker-entrypoint.sh b/templates/docker-entrypoint.sh
index 38c1a77..50afaa6 100644
--- a/templates/docker-entrypoint.sh
+++ b/templates/docker-entrypoint.sh
@@ -18,7 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     INSTALLDIR=`pwd`
     echo >&2 "roundcubemail found in $INSTALLDIR - installing update..."
     (cd /usr/src/roundcubemail && bin/installto.sh -y $INSTALLDIR)
-    composer.phar update --no-dev
+    composer update --no-dev
   fi
 
   if [ -f /run/secrets/roundcube_db_user ]; then