From 305067f94c924cd6640379938c589b8e661fece7 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 7 Aug 2015 12:01:25 -0700 Subject: [PATCH] Add back the 5.5 keys that are officially listed, and sort all the key lists --- 5.5/Dockerfile | 2 +- 5.5/apache/Dockerfile | 2 +- 5.5/fpm/Dockerfile | 2 +- 5.6/Dockerfile | 2 +- 5.6/apache/Dockerfile | 2 +- 5.6/fpm/Dockerfile | 2 +- update.sh | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 88501188..0fc818bd 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -12,7 +12,7 @@ RUN mkdir -p $PHP_INI_DIR/conf.d #### #### -ENV GPG_KEYS F38252826ACD957EF380D39F2F7956BC5DA04B5D +ENV GPG_KEYS 0B96609E270F565C13292B24C13C70B87267B52D 0BD78B5F97500D450838F95DFE857D9A90D90EC1 F38252826ACD957EF380D39F2F7956BC5DA04B5D RUN set -xe \ && for key in $GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 950b706e..d8d7866d 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -25,7 +25,7 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 #### -ENV GPG_KEYS F38252826ACD957EF380D39F2F7956BC5DA04B5D +ENV GPG_KEYS 0B96609E270F565C13292B24C13C70B87267B52D 0BD78B5F97500D450838F95DFE857D9A90D90EC1 F38252826ACD957EF380D39F2F7956BC5DA04B5D RUN set -xe \ && for key in $GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index fa0eeadc..47f0bd1e 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -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 GPG_KEYS F38252826ACD957EF380D39F2F7956BC5DA04B5D +ENV GPG_KEYS 0B96609E270F565C13292B24C13C70B87267B52D 0BD78B5F97500D450838F95DFE857D9A90D90EC1 F38252826ACD957EF380D39F2F7956BC5DA04B5D RUN set -xe \ && for key in $GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 31858178..7c27f1c0 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -12,7 +12,7 @@ RUN mkdir -p $PHP_INI_DIR/conf.d #### #### -ENV GPG_KEYS 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 +ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 RUN set -xe \ && for key in $GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 7c8e1105..e1bbf365 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -25,7 +25,7 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 #### -ENV GPG_KEYS 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 +ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 RUN set -xe \ && for key in $GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index 8ada96ff..19a1a3cc 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -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 GPG_KEYS 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 +ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 RUN set -xe \ && for key in $GPG_KEYS; do \ gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ diff --git a/update.sh b/update.sh index d402d63f..6e50a51b 100755 --- a/update.sh +++ b/update.sh @@ -4,10 +4,10 @@ set -e declare -A gpgKeys gpgKeys=( [7.0]='1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763' - [5.6]='6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1' - [5.5]='F38252826ACD957EF380D39F2F7956BC5DA04B5D' + [5.6]='0BD78B5F97500D450838F95DFE857D9A90D90EC1 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3' + [5.5]='0B96609E270F565C13292B24C13C70B87267B52D 0BD78B5F97500D450838F95DFE857D9A90D90EC1 F38252826ACD957EF380D39F2F7956BC5DA04B5D' [5.4]='F38252826ACD957EF380D39F2F7956BC5DA04B5D' - [5.3]='0B96609E270F565C13292B24C13C70B87267B52D 0A95E9A026542D53835E3F3A7DEC4E69FC9C83D7' + [5.3]='0A95E9A026542D53835E3F3A7DEC4E69FC9C83D7 0B96609E270F565C13292B24C13C70B87267B52D' ) # see http://php.net/downloads.php