Skip to content

Commit fd76f18

Browse files
authored
Merge pull request #80 from drupal-docker/use-curl-for-alpine
Get composer with curl
2 parents 52b96e9 + 4925331 commit fd76f18

3 files changed

Lines changed: 3 additions & 12 deletions

File tree

5.6/Dockerfile-alpine-cli

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev pos
1010
&& docker-php-ext-install opcache bcmath soap \
1111
&& pecl install redis-2.2.8 \
1212
&& docker-php-ext-enable redis \
13-
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
14-
&& php -r "if (hash_file('SHA384', 'composer-setup.php') === '669656bab3166a7aff8a7506b8cb2d1c292f042046c5a994c43155c0be6190fa0355160742ab2e1c88d40d5be660b410') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
15-
&& php composer-setup.php \
16-
&& php -r "unlink('composer-setup.php');" \
13+
&& curl -sS https://getcomposer.org/installer | php \
1714
&& mv composer.phar /usr/local/bin/composer \
1815
&& echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \
1916
&& apk add --no-cache sudo git libpng libjpeg libpq libxml2 mysql-client openssh-client rsync \

7.0/Dockerfile-alpine-cli

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev pos
1010
&& docker-php-ext-install opcache bcmath soap \
1111
&& pecl install redis-3.1.1 \
1212
&& docker-php-ext-enable redis \
13-
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
14-
&& php -r "if (hash_file('SHA384', 'composer-setup.php') === '669656bab3166a7aff8a7506b8cb2d1c292f042046c5a994c43155c0be6190fa0355160742ab2e1c88d40d5be660b410') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
15-
&& php composer-setup.php \
16-
&& php -r "unlink('composer-setup.php');" \
13+
&& curl -sS https://getcomposer.org/installer | php \
1714
&& mv composer.phar /usr/local/bin/composer \
1815
&& echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \
1916
&& apk add --no-cache sudo git libpng libjpeg libpq libxml2 mysql-client openssh-client rsync \

7.1/Dockerfile-alpine-cli

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev pos
1010
&& docker-php-ext-install opcache bcmath soap \
1111
&& pecl install redis-3.1.1 \
1212
&& docker-php-ext-enable redis \
13-
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
14-
&& php -r "if (hash_file('SHA384', 'composer-setup.php') === '669656bab3166a7aff8a7506b8cb2d1c292f042046c5a994c43155c0be6190fa0355160742ab2e1c88d40d5be660b410') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
15-
&& php composer-setup.php \
16-
&& php -r "unlink('composer-setup.php');" \
13+
&& curl -sS https://getcomposer.org/installer | php \
1714
&& mv composer.phar /usr/local/bin/composer \
1815
&& echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \
1916
&& apk add --no-cache sudo git libpng libjpeg libpq libxml2 mysql-client openssh-client rsync \

0 commit comments

Comments
 (0)