From 1dcb6d17643e48ea1329ede9cf9a08b2f697b2fd Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 22 Apr 2015 13:21:14 -0700 Subject: [PATCH] More resilient gpg getting --- 5.4/Dockerfile | 6 +++++- 5.4/apache/Dockerfile | 6 +++++- 5.4/fpm/Dockerfile | 6 +++++- 5.5/Dockerfile | 6 +++++- 5.5/apache/Dockerfile | 6 +++++- 5.5/fpm/Dockerfile | 6 +++++- 5.6/Dockerfile | 6 +++++- 5.6/apache/Dockerfile | 6 +++++- 5.6/fpm/Dockerfile | 6 +++++- update.sh | 2 +- 10 files changed, 46 insertions(+), 10 deletions(-) diff --git a/5.4/Dockerfile b/5.4/Dockerfile index 471affbe..5dc1ac8c 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -12,7 +12,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d #### #### -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys F38252826ACD957EF380D39F2F7956BC5DA04B5D +ENV GPG_KEYS F38252826ACD957EF380D39F2F7956BC5DA04B5D +RUN set -xe \ + && for key in $GPG_KEYS; do \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + done ENV PHP_VERSION 5.4.40 diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index 0f67f92e..93a3700a 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -25,7 +25,11 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 #### -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys F38252826ACD957EF380D39F2F7956BC5DA04B5D +ENV GPG_KEYS F38252826ACD957EF380D39F2F7956BC5DA04B5D +RUN set -xe \ + && for key in $GPG_KEYS; do \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + done ENV PHP_VERSION 5.4.40 diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile index 733c1e86..40265068 100644 --- a/5.4/fpm/Dockerfile +++ b/5.4/fpm/Dockerfile @@ -13,7 +13,11 @@ 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 #### -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys F38252826ACD957EF380D39F2F7956BC5DA04B5D +ENV GPG_KEYS F38252826ACD957EF380D39F2F7956BC5DA04B5D +RUN set -xe \ + && for key in $GPG_KEYS; do \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + done ENV PHP_VERSION 5.4.40 diff --git a/5.5/Dockerfile b/5.5/Dockerfile index e2ae76b4..ddacfcc6 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -12,7 +12,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d #### #### -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D +ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D +RUN set -xe \ + && for key in $GPG_KEYS; do \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + done ENV PHP_VERSION 5.5.24 diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 90817ead..80e01fc3 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -25,7 +25,11 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 #### -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D +ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D +RUN set -xe \ + && for key in $GPG_KEYS; do \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + done ENV PHP_VERSION 5.5.24 diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index 9f53bfb0..9aca52fb 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -13,7 +13,11 @@ 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 #### -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D +ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D +RUN set -xe \ + && for key in $GPG_KEYS; do \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + done ENV PHP_VERSION 5.5.24 diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 0e970d6a..eb317be5 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -12,7 +12,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d #### #### -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 +ENV GPG_KEYS 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 +RUN set -xe \ + && for key in $GPG_KEYS; do \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + done ENV PHP_VERSION 5.6.8 diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index ff0db7e8..9304b891 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -25,7 +25,11 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2 #### -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 +ENV GPG_KEYS 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 +RUN set -xe \ + && for key in $GPG_KEYS; do \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + done ENV PHP_VERSION 5.6.8 diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index d5d0565a..3994c2ee 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -13,7 +13,11 @@ 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 #### -RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 +ENV GPG_KEYS 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1 +RUN set -xe \ + && for key in $GPG_KEYS; do \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \ + done ENV PHP_VERSION 5.6.8 diff --git a/update.sh b/update.sh index 88ccef65..dff12ceb 100755 --- a/update.sh +++ b/update.sh @@ -49,7 +49,7 @@ for version in "${versions[@]}"; do set -x sed -ri ' s/^(ENV PHP_VERSION) .*/\1 '"$fullVersion"'/; - s/^(RUN gpg .* --recv-keys) [0-9a-fA-F ]*$/\1 '"$gpgKey"'/ + s/^(ENV GPG_KEYS) [0-9a-fA-F ]*$/\1 '"$gpgKey"'/ ' "$version/Dockerfile" "$version/"*/Dockerfile ) done