From 21dcc046c9ad69d62c56f121978fb3035f83c7ec Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sat, 20 Mar 2021 02:10:09 +0200 Subject: [PATCH 1/2] fix(hirak/prestissimo package): normalize installation of the package Avoid installation of hirak/prestissimo for the second version of the composer. Change user to root, due to usage of this user as a common one. --- workspace/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index af8da12..188284e 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1026,13 +1026,13 @@ RUN if [ ${INSTALL_DEPLOYER} = true ]; then \ ########################################################################### # Prestissimo: ########################################################################### -USER laradock - ARG INSTALL_PRESTISSIMO=false RUN if [ ${INSTALL_PRESTISSIMO} = true ]; then \ - # Install Prestissimo - composer global require "hirak/prestissimo" \ + if [ $(php -r "echo COMPOSER_VERSION;") = "1" ]; then \ + # Install Prestissimo + composer global require "hirak/prestissimo" \ + ;fi ;fi ########################################################################### From e059740296f894054290f1cb22cdfc5148338fff Mon Sep 17 00:00:00 2001 From: Pavel Savushkin Date: Sat, 20 Mar 2021 02:47:27 +0200 Subject: [PATCH 2/2] fix(hirak/prestissimo package): add end of the line --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 188284e..3563988 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -1032,7 +1032,7 @@ RUN if [ ${INSTALL_PRESTISSIMO} = true ]; then \ if [ $(php -r "echo COMPOSER_VERSION;") = "1" ]; then \ # Install Prestissimo composer global require "hirak/prestissimo" \ - ;fi + ;fi \ ;fi ###########################################################################