Skip to content

Commit 972294a

Browse files
yosifkityosifkit
committed
Fix failure to remove non-existent gpg files
1 parent d8abce4 commit 972294a

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

‎10/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
26+
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2727
&& chmod +x /usr/local/bin/gosu \
2828
&& gosu nobody true \
2929
&& apt-get purge -y --auto-remove ca-certificates wget
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
export GNUPGHOME="$(mktemp -d)"; \
4444
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4545
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
46-
rm -r "$GNUPGHOME"; \
46+
rm -rf "$GNUPGHOME"; \
4747
apt-key list
4848

4949
ENV PG_MAJOR 10

‎9.2/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
26+
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2727
&& chmod +x /usr/local/bin/gosu \
2828
&& gosu nobody true \
2929
&& apt-get purge -y --auto-remove ca-certificates wget
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
export GNUPGHOME="$(mktemp -d)"; \
4444
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4545
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
46-
rm -r "$GNUPGHOME"; \
46+
rm -rf "$GNUPGHOME"; \
4747
apt-key list
4848

4949
ENV PG_MAJOR 9.2

‎9.3/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
26+
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2727
&& chmod +x /usr/local/bin/gosu \
2828
&& gosu nobody true \
2929
&& apt-get purge -y --auto-remove ca-certificates wget
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
export GNUPGHOME="$(mktemp -d)"; \
4444
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4545
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
46-
rm -r "$GNUPGHOME"; \
46+
rm -rf "$GNUPGHOME"; \
4747
apt-key list
4848

4949
ENV PG_MAJOR 9.3

‎9.4/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
26+
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2727
&& chmod +x /usr/local/bin/gosu \
2828
&& gosu nobody true \
2929
&& apt-get purge -y --auto-remove ca-certificates wget
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
export GNUPGHOME="$(mktemp -d)"; \
4444
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4545
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
46-
rm -r "$GNUPGHOME"; \
46+
rm -rf "$GNUPGHOME"; \
4747
apt-key list
4848

4949
ENV PG_MAJOR 9.4

‎9.5/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
26+
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2727
&& chmod +x /usr/local/bin/gosu \
2828
&& gosu nobody true \
2929
&& apt-get purge -y --auto-remove ca-certificates wget
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
export GNUPGHOME="$(mktemp -d)"; \
4444
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4545
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
46-
rm -r "$GNUPGHOME"; \
46+
rm -rf "$GNUPGHOME"; \
4747
apt-key list
4848

4949
ENV PG_MAJOR 9.5

‎9.6/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
26+
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2727
&& chmod +x /usr/local/bin/gosu \
2828
&& gosu nobody true \
2929
&& apt-get purge -y --auto-remove ca-certificates wget
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
export GNUPGHOME="$(mktemp -d)"; \
4444
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4545
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
46-
rm -r "$GNUPGHOME"; \
46+
rm -rf "$GNUPGHOME"; \
4747
apt-key list
4848

4949
ENV PG_MAJOR 9.6

‎Dockerfile-debian.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN set -x \
2323
&& export GNUPGHOME="$(mktemp -d)" \
2424
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
2525
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
26-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
26+
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
2727
&& chmod +x /usr/local/bin/gosu \
2828
&& gosu nobody true \
2929
&& apt-get purge -y --auto-remove ca-certificates wget
@@ -43,7 +43,7 @@ RUN set -ex; \
4343
export GNUPGHOME="$(mktemp -d)"; \
4444
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
4545
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
46-
rm -r "$GNUPGHOME"; \
46+
rm -rf "$GNUPGHOME"; \
4747
apt-key list
4848

4949
ENV PG_MAJOR %%PG_MAJOR%%

0 commit comments

Comments
 (0)