Skip to content

Commit 1ca4a57

Browse files
tianontianon
committed
Use "rm -rf" when deleting GNUPGHOME to combat a minor race condition
1 parent 8855871 commit 1ca4a57

File tree

23 files changed

+23
-23
lines changed

23 files changed

+23
-23
lines changed

‎2.7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN set -ex \
2929
&& export GNUPGHOME="$(mktemp -d)" \
3030
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3131
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
32-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
32+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3333
&& mkdir -p /usr/src/python \
3434
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
3535
&& rm python.tar.xz \

‎2.7/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN set -ex \
2626
&& export GNUPGHOME="$(mktemp -d)" \
2727
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
2828
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
29-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
29+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3030
&& mkdir -p /usr/src/python \
3131
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
3232
&& rm python.tar.xz \

‎2.7/alpine3.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN set -ex \
2626
&& export GNUPGHOME="$(mktemp -d)" \
2727
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
2828
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
29-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
29+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3030
&& mkdir -p /usr/src/python \
3131
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
3232
&& rm python.tar.xz \

‎2.7/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN set -ex \
4444
&& export GNUPGHOME="$(mktemp -d)" \
4545
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
4646
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
47-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
47+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
4848
&& mkdir -p /usr/src/python \
4949
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
5050
&& rm python.tar.xz \

‎2.7/wheezy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN set -ex \
2929
&& export GNUPGHOME="$(mktemp -d)" \
3030
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3131
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
32-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
32+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3333
&& mkdir -p /usr/src/python \
3434
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
3535
&& rm python.tar.xz \

‎3.3/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN set -ex \
3535
&& export GNUPGHOME="$(mktemp -d)" \
3636
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3737
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
38-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
38+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3939
&& mkdir -p /usr/src/python \
4040
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
4141
&& rm python.tar.xz \

‎3.3/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN set -ex \
3232
&& export GNUPGHOME="$(mktemp -d)" \
3333
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3434
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
35-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
35+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3636
&& mkdir -p /usr/src/python \
3737
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
3838
&& rm python.tar.xz \

‎3.3/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ RUN set -ex \
5050
&& export GNUPGHOME="$(mktemp -d)" \
5151
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
5252
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
53-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
53+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
5454
&& mkdir -p /usr/src/python \
5555
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
5656
&& rm python.tar.xz \

‎3.3/wheezy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN set -ex \
3535
&& export GNUPGHOME="$(mktemp -d)" \
3636
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3737
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
38-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
38+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3939
&& mkdir -p /usr/src/python \
4040
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
4141
&& rm python.tar.xz \

‎3.4/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN set -ex \
3535
&& export GNUPGHOME="$(mktemp -d)" \
3636
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
3737
&& gpg --batch --verify python.tar.xz.asc python.tar.xz \
38-
&& rm -r "$GNUPGHOME" python.tar.xz.asc \
38+
&& rm -rf "$GNUPGHOME" python.tar.xz.asc \
3939
&& mkdir -p /usr/src/python \
4040
&& tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \
4141
&& rm python.tar.xz \

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy