Add "-f" to help combat gnupg2 race condition

tianon · tianon · commit 1e6d4be06a13 · 2017-12-08T13:57:05.000-08:00
diff --git a/Dockerfile-cli.template b/Dockerfile-cli.template
@@ -62,7 +62,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
-	rm -r "$GNUPGHOME" /usr/local/bin/wp.gpg; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
 	chmod +x /usr/local/bin/wp; \
diff --git a/php5.6/cli/Dockerfile b/php5.6/cli/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
-	rm -r "$GNUPGHOME" /usr/local/bin/wp.gpg; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
 	chmod +x /usr/local/bin/wp; \
diff --git a/php7.0/cli/Dockerfile b/php7.0/cli/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
-	rm -r "$GNUPGHOME" /usr/local/bin/wp.gpg; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
 	chmod +x /usr/local/bin/wp; \
diff --git a/php7.1/cli/Dockerfile b/php7.1/cli/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
-	rm -r "$GNUPGHOME" /usr/local/bin/wp.gpg; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
 	chmod +x /usr/local/bin/wp; \
diff --git a/php7.2/cli/Dockerfile b/php7.2/cli/Dockerfile
@@ -62,7 +62,7 @@ RUN set -ex; \
 	export GNUPGHOME="$(mktemp -d)"; \
 	gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \
 	gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \
-	rm -r "$GNUPGHOME" /usr/local/bin/wp.gpg; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \
 	\
 	echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" | sha512sum -c -; \
 	chmod +x /usr/local/bin/wp; \

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ RUN set -ex; \`
`62`	`62`	`export GNUPGHOME="$(mktemp -d)"; \`
`63`	`63`	`gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$WORDPRESS_CLI_GPG_KEY"; \`
`64`	`64`	`gpg --batch --decrypt --output /usr/local/bin/wp /usr/local/bin/wp.gpg; \`
`65`		`- rm -r "$GNUPGHOME" /usr/local/bin/wp.gpg; \`
	`65`	`+ rm -rf "$GNUPGHOME" /usr/local/bin/wp.gpg; \`
`66`	`66`	`\`
`67`	`67`	`echo "$WORDPRESS_CLI_SHA512 */usr/local/bin/wp" \| sha512sum -c -; \`
`68`	`68`	`chmod +x /usr/local/bin/wp; \`