Skip to content

Commit a8bbb7c

Browse files
committed
[FIX] 11.0-13.0: use gpg batch mode
Without batch option, gpg may try to use /dev/tty. See https://bugs.debian.org/913614
1 parent a86f91a commit a8bbb7c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

11.0/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN set -x; \
3535
&& export GNUPGHOME="$(mktemp -d)" \
3636
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
3737
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
38-
&& gpg --armor --export "${repokey}" | apt-key add - \
38+
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
3939
&& gpgconf --kill all \
4040
&& rm -rf "$GNUPGHOME" \
4141
&& apt-get update \

12.0/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN set -x; \
3535
&& export GNUPGHOME="$(mktemp -d)" \
3636
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
3737
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
38-
&& gpg --armor --export "${repokey}" | apt-key add - \
38+
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
3939
&& gpgconf --kill all \
4040
&& rm -rf "$GNUPGHOME" \
4141
&& apt-get update \
@@ -48,7 +48,7 @@ RUN set -x;\
4848
&& export GNUPGHOME="$(mktemp -d)" \
4949
&& repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
5050
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
51-
&& gpg --armor --export "${repokey}" | apt-key add - \
51+
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \
5252
&& gpgconf --kill all \
5353
&& rm -rf "$GNUPGHOME" \
5454
&& apt-get update \

13.0/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ RUN set -x; \
3636
&& export GNUPGHOME="$(mktemp -d)" \
3737
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
3838
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
39-
&& gpg --armor --export "${repokey}" | apt-key add - \
39+
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
4040
&& gpgconf --kill all \
4141
&& rm -rf "$GNUPGHOME" \
4242
&& apt-get update \

0 commit comments

Comments
 (0)