danog/docker-php-extension-installer
1
0
Fork 0
mirror of https://github.com/danog/docker-php-extension-installer.git synced 2024-12-11 17:09:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #214 from mlocati/curl-fail

Browse Source 
Exit the script if curl fails
This commit is contained in:
Michele Locati 2020-12-11 15:15:33 +01:00 committed by GitHub
commit b47a5db53b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install-php-extensions
View File

@ -1116,7 +1116,7 @@ installBundledModule() {
getPackageSource() { getPackageSource() {
mkdir -p /tmp/src mkdir -p /tmp/src
getPackageSource_tempFile=$(mktemp -p /tmp/src) getPackageSource_tempFile=$(mktemp -p /tmp/src)
curl -L -s -S -o "$getPackageSource_tempFile" "$1" curl -sSLf -o "$getPackageSource_tempFile" "$1"
getPackageSource_tempDir=$(mktemp -p /tmp/src -d) getPackageSource_tempDir=$(mktemp -p /tmp/src -d)
cd "$getPackageSource_tempDir" cd "$getPackageSource_tempDir"
tar -xzf "$getPackageSource_tempFile" 2>/dev/null || tar -xf "$getPackageSource_tempFile" tar -xzf "$getPackageSource_tempFile" 2>/dev/null || tar -xf "$getPackageSource_tempFile"
@ -1586,7 +1586,7 @@ installPECLModule() {
case "$DISTRO" in case "$DISTRO" in
alpine) alpine)
if ! test -f /usr/local/include/zookeeper/zookeeper.h; then if ! test -f /usr/local/include/zookeeper/zookeeper.h; then
installPECLModule_tmp="$(curl -L -s -S -f https://downloads.apache.org/zookeeper/stable | sed -E 's/["<>]/\n/g' | grep -E '^(apache-)?zookeeper-[0-9]+\.[0-9]+\.[0-9]+\.(tar\.gz|tgz)$' | head -n1)" installPECLModule_tmp="$(curl -sSLf https://downloads.apache.org/zookeeper/stable | sed -E 's/["<>]/\n/g' | grep -E '^(apache-)?zookeeper-[0-9]+\.[0-9]+\.[0-9]+\.(tar\.gz|tgz)$' | head -n1)"
if test -z "$installPECLModule_tmp"; then if test -z "$installPECLModule_tmp"; then
echo 'Failed to detect the zookeeper library URL' >&2 echo 'Failed to detect the zookeeper library URL' >&2
exit 1 exit 1
@ -1661,7 +1661,7 @@ configureInstaller() {
pecl channel-update pecl.php.net || true pecl channel-update pecl.php.net || true
return return
fi fi
curl -sSL https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -o /tmp/pickle curl -sSLf https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -o /tmp/pickle
chmod +x /tmp/pickle chmod +x /tmp/pickle
if ! stringInList 'zip' "$PHP_PREINSTALLED_MODULES"; then if ! stringInList 'zip' "$PHP_PREINSTALLED_MODULES"; then
PHP_MODULES_TO_INSTALL="zip $(removeStringFromList 'zip' "$PHP_MODULES_TO_INSTALL")" PHP_MODULES_TO_INSTALL="zip $(removeStringFromList 'zip' "$PHP_MODULES_TO_INSTALL")"