Skip to content

Commit d4d3d71

Browse files
yosifkityosifkit
committed
More resilient gpg getting
1 parent f6aa601 commit d4d3d71

File tree

10 files changed

+46
-10
lines changed

10 files changed

+46
-10
lines changed

‎5.4/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
1212
##<autogenerated>##
1313
##</autogenerated>##
1414

15-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys F38252826ACD957EF380D39F2F7956BC5DA04B5D
15+
ENV GPG_KEYS F38252826ACD957EF380D39F2F7956BC5DA04B5D
16+
RUN set -xe \
17+
&& for key in $GPG_KEYS; do \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
19+
done
1620

1721
ENV PHP_VERSION 5.4.40
1822

‎5.4/apache/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
2525
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
2626
##</autogenerated>##
2727

28-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys F38252826ACD957EF380D39F2F7956BC5DA04B5D
28+
ENV GPG_KEYS F38252826ACD957EF380D39F2F7956BC5DA04B5D
29+
RUN set -xe \
30+
&& for key in $GPG_KEYS; do \
31+
gpg --keyserver pool.sks-keyservers.net --recv-keys "$key"; \
32+
done
2933

3034
ENV PHP_VERSION 5.4.40
3135

‎5.4/fpm/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
1313
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
1414
##</autogenerated>##
1515

16-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys F38252826ACD957EF380D39F2F7956BC5DA04B5D
16+
ENV GPG_KEYS F38252826ACD957EF380D39F2F7956BC5DA04B5D
17+
RUN set -xe \
18+
&& for key in $GPG_KEYS; do \
19+
gpg --keyserver pool.sks-keyservers.net --recv-keys "$key"; \
20+
done
1721

1822
ENV PHP_VERSION 5.4.40
1923

‎5.5/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
1212
##<autogenerated>##
1313
##</autogenerated>##
1414

15-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D
15+
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D
16+
RUN set -xe \
17+
&& for key in $GPG_KEYS; do \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
19+
done
1620

1721
ENV PHP_VERSION 5.5.24
1822

‎5.5/apache/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
2525
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
2626
##</autogenerated>##
2727

28-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D
28+
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D
29+
RUN set -xe \
30+
&& for key in $GPG_KEYS; do \
31+
gpg --keyserver pool.sks-keyservers.net --recv-keys "$key"; \
32+
done
2933

3034
ENV PHP_VERSION 5.5.24
3135

‎5.5/fpm/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
1313
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
1414
##</autogenerated>##
1515

16-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D
16+
ENV GPG_KEYS 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D
17+
RUN set -xe \
18+
&& for key in $GPG_KEYS; do \
19+
gpg --keyserver pool.sks-keyservers.net --recv-keys "$key"; \
20+
done
1721

1822
ENV PHP_VERSION 5.5.24
1923

‎5.6/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
1212
##<autogenerated>##
1313
##</autogenerated>##
1414

15-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1
15+
ENV GPG_KEYS 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1
16+
RUN set -xe \
17+
&& for key in $GPG_KEYS; do \
18+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
19+
done
1620

1721
ENV PHP_VERSION 5.6.8
1822

‎5.6/apache/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ ENV PHP_EXTRA_BUILD_DEPS apache2-dev
2525
ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
2626
##</autogenerated>##
2727

28-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1
28+
ENV GPG_KEYS 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1
29+
RUN set -xe \
30+
&& for key in $GPG_KEYS; do \
31+
gpg --keyserver pool.sks-keyservers.net --recv-keys "$key"; \
32+
done
2933

3034
ENV PHP_VERSION 5.6.8
3135

‎5.6/fpm/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ RUN mkdir -p $PHP_INI_DIR/conf.d
1313
ENV PHP_EXTRA_CONFIGURE_ARGS --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data
1414
##</autogenerated>##
1515

16-
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1
16+
ENV GPG_KEYS 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1
17+
RUN set -xe \
18+
&& for key in $GPG_KEYS; do \
19+
gpg --keyserver pool.sks-keyservers.net --recv-keys "$key"; \
20+
done
1721

1822
ENV PHP_VERSION 5.6.8
1923

‎update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ for version in "${versions[@]}"; do
4949
set -x
5050
sed -ri '
5151
s/^(ENV PHP_VERSION) .*/\1 '"$fullVersion"'/;
52-
s/^(RUN gpg .* --recv-keys) [0-9a-fA-F ]*$/\1 '"$gpgKey"'/
52+
s/^(ENV GPG_KEYS) [0-9a-fA-F ]*$/\1 '"$gpgKey"'/
5353
' "$version/Dockerfile" "$version/"*/Dockerfile
5454
)
5555
done

0 commit comments

Comments
 (0)