Upgrade to PHP 7 GA.

Added GPG key and switched to the normal download links.
jpatovh · Dec 3, 2015 · ff9dcb4 · ff9dcb4
1 parent 12d7a66
commit ff9dcb4
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -12,7 +12,13 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
 ##<autogenerated>##
 ##</autogenerated>##
 
-ENV PHP_VERSION 7.0.0RC8
+ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
+RUN set -xe \
+	&& for key in $GPG_KEYS; do \
+		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+	done
+
+ENV PHP_VERSION 7.0.0
 
 # --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=" \
@@ -27,7 +33,9 @@ RUN buildDeps=" \
 	" \
 	&& set -x \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
-	&& curl -SL "https://downloads.php.net/~ab/php-$PHP_VERSION.tar.xz" -o php.tar.xz \
+	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.xz/from/this/mirror" -o php.tar.xz \
+	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.xz.asc/from/this/mirror" -o php.tar.xz.asc \
+	&& gpg --verify php.tar.xz.asc \
 	&& mkdir -p /usr/src/php \
 	&& tar -xof php.tar.xz -C /usr/src/php --strip-components=1 \
 	&& rm php.tar.xz* \

diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
@@ -25,7 +25,13 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
 ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
 ##</autogenerated>##
 
-ENV PHP_VERSION 7.0.0RC8
+ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
+RUN set -xe \
+	&& for key in $GPG_KEYS; do \
+		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+	done
+
+ENV PHP_VERSION 7.0.0
 
 # --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=" \
@@ -40,7 +46,9 @@ RUN buildDeps=" \
 	" \
 	&& set -x \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
-	&& curl -SL "https://downloads.php.net/~ab/php-$PHP_VERSION.tar.xz" -o php.tar.xz \
+	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.xz/from/this/mirror" -o php.tar.xz \
+	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.xz.asc/from/this/mirror" -o php.tar.xz.asc \
+	&& gpg --verify php.tar.xz.asc \
 	&& mkdir -p /usr/src/php \
 	&& tar -xof php.tar.xz -C /usr/src/php --strip-components=1 \
 	&& rm php.tar.xz* \

diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile
@@ -13,7 +13,13 @@ 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
 ##</autogenerated>##
 
-ENV PHP_VERSION 7.0.0RC8
+ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763
+RUN set -xe \
+	&& for key in $GPG_KEYS; do \
+		gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
+	done
+
+ENV PHP_VERSION 7.0.0
 
 # --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=" \
@@ -28,7 +34,9 @@ RUN buildDeps=" \
 	" \
 	&& set -x \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
-	&& curl -SL "https://downloads.php.net/~ab/php-$PHP_VERSION.tar.xz" -o php.tar.xz \
+	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.xz/from/this/mirror" -o php.tar.xz \
+	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.xz.asc/from/this/mirror" -o php.tar.xz.asc \
+	&& gpg --verify php.tar.xz.asc \
 	&& mkdir -p /usr/src/php \
 	&& tar -xof php.tar.xz -C /usr/src/php --strip-components=1 \
 	&& rm php.tar.xz* \

diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -3,8 +3,8 @@ set -e
 
 declare -A aliases
 aliases=(
-	[5.6]='5 latest'
-	[7.0]='7'
+	[5.6]='5'
+	[7.0]='7 latest'
 )
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"