Fix failure to remove non-existent gpg files
This commit is contained in:
parent
d8abce4e82
commit
972294a377
|
|
@ -23,7 +23,7 @@ RUN set -x \
|
||||||
&& export GNUPGHOME="$(mktemp -d)" \
|
&& export GNUPGHOME="$(mktemp -d)" \
|
||||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
||||||
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
||||||
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
||||||
&& chmod +x /usr/local/bin/gosu \
|
&& chmod +x /usr/local/bin/gosu \
|
||||||
&& gosu nobody true \
|
&& gosu nobody true \
|
||||||
&& apt-get purge -y --auto-remove ca-certificates wget
|
&& apt-get purge -y --auto-remove ca-certificates wget
|
||||||
|
|
@ -43,7 +43,7 @@ RUN set -ex; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||||
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
||||||
rm -r "$GNUPGHOME"; \
|
rm -rf "$GNUPGHOME"; \
|
||||||
apt-key list
|
apt-key list
|
||||||
|
|
||||||
ENV PG_MAJOR 10
|
ENV PG_MAJOR 10
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ RUN set -x \
|
||||||
&& export GNUPGHOME="$(mktemp -d)" \
|
&& export GNUPGHOME="$(mktemp -d)" \
|
||||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
||||||
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
||||||
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
||||||
&& chmod +x /usr/local/bin/gosu \
|
&& chmod +x /usr/local/bin/gosu \
|
||||||
&& gosu nobody true \
|
&& gosu nobody true \
|
||||||
&& apt-get purge -y --auto-remove ca-certificates wget
|
&& apt-get purge -y --auto-remove ca-certificates wget
|
||||||
|
|
@ -43,7 +43,7 @@ RUN set -ex; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||||
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
||||||
rm -r "$GNUPGHOME"; \
|
rm -rf "$GNUPGHOME"; \
|
||||||
apt-key list
|
apt-key list
|
||||||
|
|
||||||
ENV PG_MAJOR 9.2
|
ENV PG_MAJOR 9.2
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ RUN set -x \
|
||||||
&& export GNUPGHOME="$(mktemp -d)" \
|
&& export GNUPGHOME="$(mktemp -d)" \
|
||||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
||||||
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
||||||
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
||||||
&& chmod +x /usr/local/bin/gosu \
|
&& chmod +x /usr/local/bin/gosu \
|
||||||
&& gosu nobody true \
|
&& gosu nobody true \
|
||||||
&& apt-get purge -y --auto-remove ca-certificates wget
|
&& apt-get purge -y --auto-remove ca-certificates wget
|
||||||
|
|
@ -43,7 +43,7 @@ RUN set -ex; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||||
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
||||||
rm -r "$GNUPGHOME"; \
|
rm -rf "$GNUPGHOME"; \
|
||||||
apt-key list
|
apt-key list
|
||||||
|
|
||||||
ENV PG_MAJOR 9.3
|
ENV PG_MAJOR 9.3
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ RUN set -x \
|
||||||
&& export GNUPGHOME="$(mktemp -d)" \
|
&& export GNUPGHOME="$(mktemp -d)" \
|
||||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
||||||
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
||||||
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
||||||
&& chmod +x /usr/local/bin/gosu \
|
&& chmod +x /usr/local/bin/gosu \
|
||||||
&& gosu nobody true \
|
&& gosu nobody true \
|
||||||
&& apt-get purge -y --auto-remove ca-certificates wget
|
&& apt-get purge -y --auto-remove ca-certificates wget
|
||||||
|
|
@ -43,7 +43,7 @@ RUN set -ex; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||||
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
||||||
rm -r "$GNUPGHOME"; \
|
rm -rf "$GNUPGHOME"; \
|
||||||
apt-key list
|
apt-key list
|
||||||
|
|
||||||
ENV PG_MAJOR 9.4
|
ENV PG_MAJOR 9.4
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ RUN set -x \
|
||||||
&& export GNUPGHOME="$(mktemp -d)" \
|
&& export GNUPGHOME="$(mktemp -d)" \
|
||||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
||||||
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
||||||
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
||||||
&& chmod +x /usr/local/bin/gosu \
|
&& chmod +x /usr/local/bin/gosu \
|
||||||
&& gosu nobody true \
|
&& gosu nobody true \
|
||||||
&& apt-get purge -y --auto-remove ca-certificates wget
|
&& apt-get purge -y --auto-remove ca-certificates wget
|
||||||
|
|
@ -43,7 +43,7 @@ RUN set -ex; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||||
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
||||||
rm -r "$GNUPGHOME"; \
|
rm -rf "$GNUPGHOME"; \
|
||||||
apt-key list
|
apt-key list
|
||||||
|
|
||||||
ENV PG_MAJOR 9.5
|
ENV PG_MAJOR 9.5
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ RUN set -x \
|
||||||
&& export GNUPGHOME="$(mktemp -d)" \
|
&& export GNUPGHOME="$(mktemp -d)" \
|
||||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
||||||
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
||||||
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
||||||
&& chmod +x /usr/local/bin/gosu \
|
&& chmod +x /usr/local/bin/gosu \
|
||||||
&& gosu nobody true \
|
&& gosu nobody true \
|
||||||
&& apt-get purge -y --auto-remove ca-certificates wget
|
&& apt-get purge -y --auto-remove ca-certificates wget
|
||||||
|
|
@ -43,7 +43,7 @@ RUN set -ex; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||||
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
||||||
rm -r "$GNUPGHOME"; \
|
rm -rf "$GNUPGHOME"; \
|
||||||
apt-key list
|
apt-key list
|
||||||
|
|
||||||
ENV PG_MAJOR 9.6
|
ENV PG_MAJOR 9.6
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ RUN set -x \
|
||||||
&& export GNUPGHOME="$(mktemp -d)" \
|
&& export GNUPGHOME="$(mktemp -d)" \
|
||||||
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|
||||||
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
|
||||||
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
|
||||||
&& chmod +x /usr/local/bin/gosu \
|
&& chmod +x /usr/local/bin/gosu \
|
||||||
&& gosu nobody true \
|
&& gosu nobody true \
|
||||||
&& apt-get purge -y --auto-remove ca-certificates wget
|
&& apt-get purge -y --auto-remove ca-certificates wget
|
||||||
|
|
@ -43,7 +43,7 @@ RUN set -ex; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||||
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
gpg --export "$key" > /etc/apt/trusted.gpg.d/postgres.gpg; \
|
||||||
rm -r "$GNUPGHOME"; \
|
rm -rf "$GNUPGHOME"; \
|
||||||
apt-key list
|
apt-key list
|
||||||
|
|
||||||
ENV PG_MAJOR %%PG_MAJOR%%
|
ENV PG_MAJOR %%PG_MAJOR%%
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue