Open-Harbor/docker-odoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

[FIX] 11.0-13.0: use gpg batch mode

Browse Source 
Without batch option, gpg may try to use /dev/tty.

See https://bugs.debian.org/913614
This commit is contained in:
Christophe Monniez 2019-10-10 16:49:31 +02:00 committed by Christophe Monniez
parent 9409487426
commit c1fbc53720
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
11.0/Dockerfile
View File

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

4
12.0/Dockerfile
View File

@ -41,7 +41,7 @@ RUN set -x; \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --armor --export "${repokey}" | apt-key add - \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \
@ -54,7 +54,7 @@ RUN set -x;\
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \ && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --armor --export "${repokey}" | apt-key add - \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \

2
13.0/Dockerfile
View File

@ -39,7 +39,7 @@ RUN set -x; \
&& export GNUPGHOME="$(mktemp -d)" \ && export GNUPGHOME="$(mktemp -d)" \
&& repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
&& gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
&& gpg --armor --export "${repokey}" | apt-key add - \ && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
&& gpgconf --kill all \ && gpgconf --kill all \
&& rm -rf "$GNUPGHOME" \ && rm -rf "$GNUPGHOME" \
&& apt-get update \ && apt-get update \