Skip to content

Commit

Permalink
Merge pull request PrestaShop#36266 from matthieu-rolland/fix-docker-…
Browse files Browse the repository at this point in the history
…install

Do not use makefile to do a composer install in docker script
  • Loading branch information
M0rgan01 authored May 30, 2024
2 parents e2cb1dd + 9f52b2b commit e967586
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .docker/docker_run_git.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ if [ "${DISABLE_MAKE}" != "1" ]; then
runuser -g www-data -u www-data -- php -r "copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');" && php /tmp/composer-setup.php --no-ansi --install-dir=/usr/local/bin --filename=composer && rm -rf /tmp/composer-setup.php

echo "\n* Running composer ...";
runuser -g www-data -u www-data -- /usr/bin/make composer
COMPOSER_PROCESS_TIMEOUT=600 runuser -g www-data -u www-data -- /usr/local/bin/composer install --no-interaction
if [ $? -ne 0]; then
echo Composer install failed
exit 1
Expand Down

0 comments on commit e967586

Please sign in to comment.