Skip to content

Commit 491f994

Browse files
tianonthresheek
authored andcommitted
Add "-f" to GNUPGHOME deletions (helps avoid a GnuPG 2.x race condition)
This is the race condition that has been plaguing the official build for the past many hours, and we've found that adding "-f" helps mitigate it (doesn't completely eliminate it, but it's a dramatic improvement in the successful build ratio).
1 parent dbd053d commit 491f994

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

mainline/alpine-perl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
8282
done; \
8383
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
8484
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
85-
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
85+
&& rm -rf "$GNUPGHOME" nginx.tar.gz.asc \
8686
&& mkdir -p /usr/src \
8787
&& tar -zxC /usr/src -f nginx.tar.gz \
8888
&& rm nginx.tar.gz \

mainline/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
8080
done; \
8181
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
8282
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
83-
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
83+
&& rm -rf "$GNUPGHOME" nginx.tar.gz.asc \
8484
&& mkdir -p /usr/src \
8585
&& tar -zxC /usr/src -f nginx.tar.gz \
8686
&& rm nginx.tar.gz \

stable/alpine-perl/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
8282
done; \
8383
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
8484
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
85-
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
85+
&& rm -rf "$GNUPGHOME" nginx.tar.gz.asc \
8686
&& mkdir -p /usr/src \
8787
&& tar -zxC /usr/src -f nginx.tar.gz \
8888
&& rm nginx.tar.gz \

stable/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
8080
done; \
8181
test -z "$found" && echo >&2 "error: failed to fetch GPG key $GPG_KEYS" && exit 1; \
8282
gpg --batch --verify nginx.tar.gz.asc nginx.tar.gz \
83-
&& rm -r "$GNUPGHOME" nginx.tar.gz.asc \
83+
&& rm -rf "$GNUPGHOME" nginx.tar.gz.asc \
8484
&& mkdir -p /usr/src \
8585
&& tar -zxC /usr/src -f nginx.tar.gz \
8686
&& rm nginx.tar.gz \

0 commit comments

Comments
 (0)