Skip to content

Commit 1b75ff3

Browse files
authored
Merge branch 'master' into deprecate/54-and-55
2 parents afff671 + 8184d81 commit 1b75ff3

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

5.6/Dockerfile-alpine-cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev pos
1111
&& pecl install redis-2.2.8 \
1212
&& docker-php-ext-enable redis \
1313
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
14-
&& php -r "if (hash_file('SHA384', 'composer-setup.php') === 'e115a8dc7871f15d853148a7fbac7da27d6c0030b848d9b3dc09e2a0388afed865e6a3d6b3c0fad45c48e2b5fc1196ae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
14+
&& php -r "if (hash_file('SHA384', 'composer-setup.php') === 'aa96f26c2b67226a324c27919f1eb05f21c248b987e6195cad9690d5c1ff713d53020a02ac8c217dbf90a7eacc9d141d') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
1515
&& php composer-setup.php \
1616
&& php -r "unlink('composer-setup.php');" \
1717
&& mv composer.phar /usr/local/bin/composer \

7.0/Dockerfile-alpine-cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev pos
1111
&& pecl install redis-3.0.0 \
1212
&& docker-php-ext-enable redis \
1313
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
14-
&& php -r "if (hash_file('SHA384', 'composer-setup.php') === 'e115a8dc7871f15d853148a7fbac7da27d6c0030b848d9b3dc09e2a0388afed865e6a3d6b3c0fad45c48e2b5fc1196ae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
14+
&& php -r "if (hash_file('SHA384', 'composer-setup.php') === 'aa96f26c2b67226a324c27919f1eb05f21c248b987e6195cad9690d5c1ff713d53020a02ac8c217dbf90a7eacc9d141d') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
1515
&& php composer-setup.php \
1616
&& php -r "unlink('composer-setup.php');" \
1717
&& mv composer.phar /usr/local/bin/composer \

7.1/Dockerfile-alpine-cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apk add --no-cache --virtual .dd-build-deps libpng-dev libjpeg-turbo-dev pos
1111
&& pecl install redis-3.0.0 \
1212
&& docker-php-ext-enable redis \
1313
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
14-
&& php -r "if (hash_file('SHA384', 'composer-setup.php') === 'e115a8dc7871f15d853148a7fbac7da27d6c0030b848d9b3dc09e2a0388afed865e6a3d6b3c0fad45c48e2b5fc1196ae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
14+
&& php -r "if (hash_file('SHA384', 'composer-setup.php') === 'aa96f26c2b67226a324c27919f1eb05f21c248b987e6195cad9690d5c1ff713d53020a02ac8c217dbf90a7eacc9d141d') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
1515
&& php composer-setup.php \
1616
&& php -r "unlink('composer-setup.php');" \
1717
&& mv composer.phar /usr/local/bin/composer \

0 commit comments

Comments
 (0)