Skip to content

Commit

Permalink
Merge pull request #43 from tianon/gpg-batch
Browse files Browse the repository at this point in the history 
Fix "gpg" usage to include "--batch"
  • Loading branch information
@keeganwitt
keeganwitt authored Dec 11, 2018
2 parents e396b0a + 91ce7cc commit 26f97c8
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions jdk11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget --no-verbose --output-document=groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm --recursive --force "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down
4 changes: 2 additions & 2 deletions jdk7-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget -qO groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm -rf "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down
4 changes: 2 additions & 2 deletions jdk7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget --no-verbose --output-document=groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm --recursive --force "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down
4 changes: 2 additions & 2 deletions jdk8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget -qO groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm -rf "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down
4 changes: 2 additions & 2 deletions jdk8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget --no-verbose --output-document=groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm --recursive --force "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down
4 changes: 2 additions & 2 deletions jre11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget --no-verbose --output-document=groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm --recursive --force "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down
4 changes: 2 additions & 2 deletions jre7-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget -qO groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm -rf "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down
4 changes: 2 additions & 2 deletions jre7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget --no-verbose --output-document=groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm --recursive --force "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down
4 changes: 2 additions & 2 deletions jre8-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget -qO groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm -rf "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down
4 changes: 2 additions & 2 deletions jre8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ RUN set -o errexit -o nounset \
fi; \
done; \
done; \
if [ $(gpg --list-keys | grep -c "pub ") -ne 5 ]; then \
if [ $(gpg --batch --no-tty --list-keys | grep -c "pub ") -ne 5 ]; then \
echo "ERROR: Failed to fetch GPG keys" >&2; \
exit 1; \
fi \
\
&& echo "Checking download signature" \
&& wget --no-verbose --output-document=groovy.zip.asc "https://dist.apache.org/repos/dist/release/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip.asc" \
&& gpg --batch --verify groovy.zip.asc groovy.zip \
&& gpg --batch --no-tty --verify groovy.zip.asc groovy.zip \
&& rm --recursive --force "${GNUPGHOME}" \
&& rm groovy.zip.asc \
\
Expand Down

0 comments on commit 26f97c8

Please sign in to comment.