mirror of
https://github.com/danog/php.git
synced 2024-11-26 20:04:58 +01:00
Adjust "update.sh" whitespace and remove unused section (old copy-pasta)
This commit is contained in:
parent
9f01025115
commit
0c5a8fead1
23
update.sh
23
update.sh
@ -69,33 +69,35 @@ for version in "${versions[@]}"; do
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
if [ -z "$fullVersion" ]; then
|
||||
echo >&2
|
||||
echo >&2 "warning: missing full version for $version; skipping"
|
||||
echo >&2
|
||||
continue
|
||||
fi
|
||||
|
||||
|
||||
gpgKey="${gpgKeys[$version]}"
|
||||
if [ -z "$gpgKey" ]; then
|
||||
echo >&2 "ERROR: missing GPG key fingerprint for $version"
|
||||
echo >&2 " try looking on https://secure.php.net/downloads.php#gpg-$version"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
dockerfiles=()
|
||||
|
||||
|
||||
{ generated_warning; cat Dockerfile-debian.template; } > "$version/Dockerfile"
|
||||
cp -v docker-php-ext-* "$version/"
|
||||
cp -v docker-php-source "$version/"
|
||||
dockerfiles+=( "$version/Dockerfile" )
|
||||
|
||||
|
||||
if [ -d "$version/alpine" ]; then
|
||||
{ generated_warning; cat Dockerfile-alpine.template; } > "$version/alpine/Dockerfile"
|
||||
cp -v docker-php-ext-* "$version/alpine/"
|
||||
cp -v docker-php-source "$version/alpine/"
|
||||
dockerfiles+=( "$version/alpine/Dockerfile" )
|
||||
fi
|
||||
|
||||
|
||||
for target in \
|
||||
apache \
|
||||
fpm fpm/alpine \
|
||||
@ -121,12 +123,7 @@ for version in "${versions[@]}"; do
|
||||
cp -v docker-php-source "$version/$target/"
|
||||
dockerfiles+=( "$version/$target/Dockerfile" )
|
||||
done
|
||||
|
||||
if [ -z "$fullVersion" ]; then
|
||||
echo >&2 "ERROR: missing $version in $packagesUrl"
|
||||
continue
|
||||
fi
|
||||
|
||||
|
||||
(
|
||||
set -x
|
||||
sed -ri '
|
||||
@ -136,7 +133,7 @@ for version in "${versions[@]}"; do
|
||||
s!%%GPG_KEYS%%!'"$gpgKey"'!;
|
||||
' "${dockerfiles[@]}"
|
||||
)
|
||||
|
||||
|
||||
newTravisEnv=
|
||||
for dockerfile in "${dockerfiles[@]}"; do
|
||||
dir="${dockerfile%Dockerfile}"
|
||||
|
Loading…
Reference in New Issue
Block a user