VladPolskiy/php-docker-library
1
0
Fork 0
mirror of https://github.com/docker-library/php.git synced 2025-08-25 06:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Swap update.sh to still generate for unknown versions and bump to 7.0.0beta1

Browse Source 
Also, update generate-stackbrew-library.sh appropriately.
This commit is contained in:
Tianon Gravi
2015-07-08 09:32:37 -07:00
parent 11f5f37233
commit 0e983d18f2
5 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
7.0/Dockerfile
View File

@ -12,7 +12,7 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
##<autogenerated>## ##<autogenerated>##
##</autogenerated>## ##</autogenerated>##
ENV PHP_VERSION 7.0.0alpha2 ENV PHP_VERSION 7.0.0beta1
# --enable-mysqlnd is included below because it's harder to compile after the fact the extensions are (since it's a plugin for several extensions, not an extension in itself) # --enable-mysqlnd is included below because it's harder to compile after the fact the extensions are (since it's a plugin for several extensions, not an extension in itself)
RUN buildDeps=" \ RUN buildDeps=" \

2
7.0/apache/Dockerfile
View File

@ -25,7 +25,7 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
##</autogenerated>## ##</autogenerated>##
ENV PHP_VERSION 7.0.0alpha2 ENV PHP_VERSION 7.0.0beta1
# --enable-mysqlnd is included below because it's harder to compile after the fact the extensions are (since it's a plugin for several extensions, not an extension in itself) # --enable-mysqlnd is included below because it's harder to compile after the fact the extensions are (since it's a plugin for several extensions, not an extension in itself)
RUN buildDeps=" \ RUN buildDeps=" \

2
7.0/fpm/Dockerfile
View File

@ -13,7 +13,7 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
##</autogenerated>## ##</autogenerated>##
ENV PHP_VERSION 7.0.0alpha2 ENV PHP_VERSION 7.0.0beta1
# --enable-mysqlnd is included below because it's harder to compile after the fact the extensions are (since it's a plugin for several extensions, not an extension in itself) # --enable-mysqlnd is included below because it's harder to compile after the fact the extensions are (since it's a plugin for several extensions, not an extension in itself)
RUN buildDeps=" \ RUN buildDeps=" \

1
generate-stackbrew-library.sh
View File

@ -4,6 +4,7 @@ set -e
declare -A aliases declare -A aliases
aliases=( aliases=(
[5.6]='5 latest' [5.6]='5 latest'
[7.0]='7'
) )
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

19
update.sh
View File

@ -10,8 +10,7 @@ gpgKeys=(
[5.3]='0B96609E270F565C13292B24C13C70B87267B52D 0A95E9A026542D53835E3F3A7DEC4E69FC9C83D7' [5.3]='0B96609E270F565C13292B24C13C70B87267B52D 0A95E9A026542D53835E3F3A7DEC4E69FC9C83D7'
) )
# see http://php.net/downloads.php # see http://php.net/downloads.php
alphaVersion="7.0"
fullAlphaVersion="7.0.0alpha2"
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
versions=( "$@" ) versions=( "$@" )
@ -32,15 +31,6 @@ for version in "${versions[@]}"; do
break break
fi fi
done done
if [ -z "$fullVersion" ]; then
echo >&2 "ERROR: missing $version in $packagesUrl"
# if version is alpha then we add the missing part
if [ "$alphaVersion" == "$version" ]; then
fullVersion="$fullAlphaVersion"
else
continue
fi
fi
gpgKey="${gpgKeys[$version]}" gpgKey="${gpgKeys[$version]}"
if [ -z "$gpgKey" ]; then if [ -z "$gpgKey" ]; then
@ -48,7 +38,7 @@ for version in "${versions[@]}"; do
echo >&2 " try looking on http://php.net/downloads.php#gpg-$version" echo >&2 " try looking on http://php.net/downloads.php#gpg-$version"
exit 1 exit 1
fi fi
( set -x; cp docker-php-ext-* "$version/" ) ( set -x; cp docker-php-ext-* "$version/" )
for variant in apache fpm; do for variant in apache fpm; do
@ -63,6 +53,11 @@ for version in "${versions[@]}"; do
( set -x; cp docker-php-ext-* "$version/$variant/" ) ( set -x; cp docker-php-ext-* "$version/$variant/" )
done done
if [ -z "$fullVersion" ]; then
echo >&2 "ERROR: missing $version in $packagesUrl"
continue
fi
( (
set -x set -x
sed -ri ' sed -ri '