Skip to content
Permalink
Browse files

Fixed composer parameters and docker image ssh-keygen no found (#398)

* added required ssh-keygen command to php-fpm service

* Fixed composer --no-suggest detection bug
  • Loading branch information...
softinker authored and REBELinBLUE committed Mar 14, 2019
1 parent dd50470 commit 5832871510c1fbf2a326d87444b25cc8b32e0da1
Showing with 8 additions and 8 deletions.
  1. +1 −0 docker/php-fpm/Dockerfile
  2. +7 −8 resources/scripts/deploy/steps/InstallComposerDependencies.sh
@@ -7,6 +7,7 @@ RUN apt-get update \
&& apt-get -y --no-install-recommends install php7.2-fpm php7.2-cli php7.2-mysql php7.2-sqlite3 php7.2-readline \
php7.2-gd php7.2-curl php7.2-mbstring php7.2-phpdbg \
php-xhprof php-xdebug \
&& apt-get -y ssh \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
&& phpdismod xdebug

@@ -23,21 +23,20 @@ if [ -f {{ release_path }}/composer.json ]; then
fi

cd {{ release_path }}

# Check if the --no-suggest flag exists, from composer >= 1.2
suggest=""
if [ $(${composer} help install | grep 'no-suggest' | wc -l) -gt 0 ]; then
suggest="--no-suggest"
fi

if [ -n "{{ include_dev }}" ]; then
# Check if the --no-suggest flag exists, from composer >= 1.2
suggest=""
if [ $(${composer} help install | grep 'no-suggest' | wc -l) -gt 0 ]; then
suggest="--no-suggest"
fi

${composer} install --no-interaction --optimize-autoloader \
--prefer-dist ${suggest} --no-ansi --working-dir {{ release_path }}


else
${composer} install --no-interaction --optimize-autoloader \
--no-dev --prefer-dist --no-suggest --no-ansi --working-dir {{ release_path }}
--no-dev --prefer-dist ${suggest} --no-ansi --working-dir {{ release_path }}
fi
fi

0 comments on commit 5832871

Please sign in to comment.
You can’t perform that action at this time.