Add PGP verification back to the RCs (by scanning to see if the file exists)

This commit is contained in:
Tianon Gravi
2016-10-17 10:31:00 -07:00
parent 005bb88143
commit ecde4f3843
8 changed files with 12 additions and 7 deletions

View File

@ -35,7 +35,7 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
ENV PHP_VERSION 7.1.0RC3 ENV PHP_VERSION 7.1.0RC3
ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="" ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz.asc"
ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69" ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69"
RUN set -xe; \ RUN set -xe; \

View File

@ -40,7 +40,7 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
ENV PHP_VERSION 7.1.0RC3 ENV PHP_VERSION 7.1.0RC3
ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="" ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz.asc"
ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69" ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69"
RUN set -xe; \ RUN set -xe; \

View File

@ -91,7 +91,7 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
ENV PHP_VERSION 7.1.0RC3 ENV PHP_VERSION 7.1.0RC3
ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="" ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz.asc"
ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69" ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69"
RUN set -xe; \ RUN set -xe; \

View File

@ -36,7 +36,7 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
ENV PHP_VERSION 7.1.0RC3 ENV PHP_VERSION 7.1.0RC3
ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="" ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz.asc"
ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69" ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69"
RUN set -xe; \ RUN set -xe; \

View File

@ -41,7 +41,7 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-gr
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
ENV PHP_VERSION 7.1.0RC3 ENV PHP_VERSION 7.1.0RC3
ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="" ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz.asc"
ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69" ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69"
RUN set -xe; \ RUN set -xe; \

View File

@ -36,7 +36,7 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
ENV PHP_VERSION 7.1.0RC3 ENV PHP_VERSION 7.1.0RC3
ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="" ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz.asc"
ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69" ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69"
RUN set -xe; \ RUN set -xe; \

View File

@ -41,7 +41,7 @@ ENV PHP_EXTRA_CONFIGURE_ARGS --enable-maintainer-zts
ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0 ENV GPG_KEYS A917B1ECDA84AEC2B568FED6F50ABC807BD5DCD0
ENV PHP_VERSION 7.1.0RC3 ENV PHP_VERSION 7.1.0RC3
ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="" ENV PHP_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz" PHP_ASC_URL="http://downloads.php.net/~davey/php-7.1.0RC3.tar.xz.asc"
ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69" ENV PHP_SHA256="" PHP_MD5="2bfa0ad51de4fce87d0175d655f6bf69"
RUN set -xe; \ RUN set -xe; \

View File

@ -98,6 +98,11 @@ for version in "${versions[@]}"; do
exit 1 exit 1
fi fi
# if we don't have a .asc URL, let's see if we can figure one out :)
if [ -z "$ascUrl" ] && wget -q --spider "$url.asc"; then
ascUrl="$url.asc"
fi
dockerfiles=() dockerfiles=()
{ generated_warning; cat Dockerfile-debian.template; } > "$version/Dockerfile" { generated_warning; cat Dockerfile-debian.template; } > "$version/Dockerfile"