Skip to content

Commit c1fbc53

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 9409487 commit c1fbc53

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
@@ -41,7 +41,7 @@ RUN set -x; \
4141
&& export GNUPGHOME="$(mktemp -d)" \
4242
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
4343
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
44-
&& gpg --armor --export "${repokey}" | apt-key add - \
44+
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
4545
&& gpgconf --kill all \
4646
&& rm -rf "$GNUPGHOME" \
4747
&& apt-get update \

12.0/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN set -x; \
4141
&& export GNUPGHOME="$(mktemp -d)" \
4242
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
4343
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
44-
&& gpg --armor --export "${repokey}" | apt-key add - \
44+
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
4545
&& gpgconf --kill all \
4646
&& rm -rf "$GNUPGHOME" \
4747
&& apt-get update \
@@ -54,7 +54,7 @@ RUN set -x;\
5454
&& export GNUPGHOME="$(mktemp -d)" \
5555
&& repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
5656
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
57-
&& gpg --armor --export "${repokey}" | apt-key add - \
57+
&& gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \
5858
&& gpgconf --kill all \
5959
&& rm -rf "$GNUPGHOME" \
6060
&& apt-get update \

13.0/Dockerfile

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

0 commit comments

Comments
 (0)