From 0eb91ddd049be69b97bf8ffbc51d5731a81f7706 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 11 Dec 2023 23:37:34 +1100 Subject: [PATCH] attempt fix for build failures Signed-off-by: Lachlan Roberts --- amazoncorretto/10.0/jdk11-alpine/Dockerfile | 2 +- amazoncorretto/10.0/jdk11/Dockerfile | 1 - amazoncorretto/10.0/jdk17-alpine/Dockerfile | 2 +- amazoncorretto/10.0/jdk17/Dockerfile | 1 - amazoncorretto/10.0/jdk21-alpine/Dockerfile | 2 +- amazoncorretto/10.0/jdk21/Dockerfile | 1 - amazoncorretto/11.0/jdk11-alpine/Dockerfile | 2 +- amazoncorretto/11.0/jdk11/Dockerfile | 1 - amazoncorretto/11.0/jdk17-alpine/Dockerfile | 2 +- amazoncorretto/11.0/jdk17/Dockerfile | 1 - amazoncorretto/11.0/jdk21-alpine/Dockerfile | 2 +- amazoncorretto/11.0/jdk21/Dockerfile | 1 - amazoncorretto/12.0/jdk17-alpine/Dockerfile | 2 +- amazoncorretto/12.0/jdk17/Dockerfile | 1 - amazoncorretto/12.0/jdk21-alpine/Dockerfile | 2 +- amazoncorretto/12.0/jdk21/Dockerfile | 1 - amazoncorretto/9.4/jdk11-alpine/Dockerfile | 2 +- amazoncorretto/9.4/jdk11/Dockerfile | 1 - amazoncorretto/9.4/jdk17-alpine/Dockerfile | 2 +- amazoncorretto/9.4/jdk17/Dockerfile | 1 - amazoncorretto/9.4/jdk21-alpine/Dockerfile | 2 +- amazoncorretto/9.4/jdk21/Dockerfile | 1 - amazoncorretto/9.4/jdk8-alpine/Dockerfile | 2 +- amazoncorretto/9.4/jdk8/Dockerfile | 1 - azul/zulu-openjdk-alpine/10.0/jdk11/Dockerfile | 2 +- azul/zulu-openjdk-alpine/10.0/jdk17/Dockerfile | 2 +- azul/zulu-openjdk-alpine/10.0/jdk21/Dockerfile | 2 +- azul/zulu-openjdk-alpine/11.0/jdk11/Dockerfile | 2 +- azul/zulu-openjdk-alpine/11.0/jdk17/Dockerfile | 2 +- azul/zulu-openjdk-alpine/11.0/jdk21/Dockerfile | 2 +- azul/zulu-openjdk-alpine/12.0/jdk17/Dockerfile | 2 +- azul/zulu-openjdk-alpine/12.0/jdk21/Dockerfile | 2 +- azul/zulu-openjdk-alpine/9.4/jdk11/Dockerfile | 2 +- azul/zulu-openjdk-alpine/9.4/jdk17/Dockerfile | 2 +- azul/zulu-openjdk-alpine/9.4/jdk21/Dockerfile | 2 +- azul/zulu-openjdk-alpine/9.4/jdk8/Dockerfile | 2 +- azul/zulu-openjdk/10.0/jdk11/Dockerfile | 4 ++-- azul/zulu-openjdk/10.0/jdk17/Dockerfile | 4 ++-- azul/zulu-openjdk/10.0/jdk21/Dockerfile | 4 ++-- azul/zulu-openjdk/11.0/jdk11/Dockerfile | 4 ++-- azul/zulu-openjdk/11.0/jdk17/Dockerfile | 4 ++-- azul/zulu-openjdk/11.0/jdk21/Dockerfile | 4 ++-- azul/zulu-openjdk/12.0/jdk17/Dockerfile | 4 ++-- azul/zulu-openjdk/12.0/jdk21/Dockerfile | 4 ++-- azul/zulu-openjdk/9.4/jdk11/Dockerfile | 4 ++-- azul/zulu-openjdk/9.4/jdk17/Dockerfile | 4 ++-- azul/zulu-openjdk/9.4/jdk21/Dockerfile | 4 ++-- azul/zulu-openjdk/9.4/jdk8/Dockerfile | 4 ++-- baseDockerfile-alpine | 2 +- baseDockerfile-amazoncorretto | 1 - baseDockerfile-slim | 4 ++-- eclipse-temurin/10.0/jdk11-alpine/Dockerfile | 2 +- eclipse-temurin/10.0/jdk11/Dockerfile | 4 ++-- eclipse-temurin/10.0/jdk17-alpine/Dockerfile | 2 +- eclipse-temurin/10.0/jdk17/Dockerfile | 4 ++-- eclipse-temurin/10.0/jdk21-alpine/Dockerfile | 2 +- eclipse-temurin/10.0/jdk21/Dockerfile | 4 ++-- eclipse-temurin/10.0/jre11-alpine/Dockerfile | 2 +- eclipse-temurin/10.0/jre11/Dockerfile | 4 ++-- eclipse-temurin/10.0/jre17-alpine/Dockerfile | 2 +- eclipse-temurin/10.0/jre17/Dockerfile | 4 ++-- eclipse-temurin/10.0/jre21-alpine/Dockerfile | 2 +- eclipse-temurin/10.0/jre21/Dockerfile | 4 ++-- eclipse-temurin/11.0/jdk11-alpine/Dockerfile | 2 +- eclipse-temurin/11.0/jdk11/Dockerfile | 4 ++-- eclipse-temurin/11.0/jdk17-alpine/Dockerfile | 2 +- eclipse-temurin/11.0/jdk17/Dockerfile | 4 ++-- eclipse-temurin/11.0/jdk21-alpine/Dockerfile | 2 +- eclipse-temurin/11.0/jdk21/Dockerfile | 4 ++-- eclipse-temurin/11.0/jre11-alpine/Dockerfile | 2 +- eclipse-temurin/11.0/jre11/Dockerfile | 4 ++-- eclipse-temurin/11.0/jre17-alpine/Dockerfile | 2 +- eclipse-temurin/11.0/jre17/Dockerfile | 4 ++-- eclipse-temurin/11.0/jre21-alpine/Dockerfile | 2 +- eclipse-temurin/11.0/jre21/Dockerfile | 4 ++-- eclipse-temurin/12.0/jdk17-alpine/Dockerfile | 2 +- eclipse-temurin/12.0/jdk17/Dockerfile | 4 ++-- eclipse-temurin/12.0/jdk21-alpine/Dockerfile | 2 +- eclipse-temurin/12.0/jdk21/Dockerfile | 4 ++-- eclipse-temurin/12.0/jre17-alpine/Dockerfile | 2 +- eclipse-temurin/12.0/jre17/Dockerfile | 4 ++-- eclipse-temurin/12.0/jre21-alpine/Dockerfile | 2 +- eclipse-temurin/12.0/jre21/Dockerfile | 4 ++-- eclipse-temurin/9.4/jdk11-alpine/Dockerfile | 2 +- eclipse-temurin/9.4/jdk11/Dockerfile | 4 ++-- eclipse-temurin/9.4/jdk17-alpine/Dockerfile | 2 +- eclipse-temurin/9.4/jdk17/Dockerfile | 4 ++-- eclipse-temurin/9.4/jdk21-alpine/Dockerfile | 2 +- eclipse-temurin/9.4/jdk21/Dockerfile | 4 ++-- eclipse-temurin/9.4/jdk8/Dockerfile | 4 ++-- eclipse-temurin/9.4/jre11-alpine/Dockerfile | 2 +- eclipse-temurin/9.4/jre11/Dockerfile | 4 ++-- eclipse-temurin/9.4/jre17-alpine/Dockerfile | 2 +- eclipse-temurin/9.4/jre17/Dockerfile | 4 ++-- eclipse-temurin/9.4/jre21-alpine/Dockerfile | 2 +- eclipse-temurin/9.4/jre21/Dockerfile | 4 ++-- eclipse-temurin/9.4/jre8-alpine/Dockerfile | 2 +- eclipse-temurin/9.4/jre8/Dockerfile | 4 ++-- 98 files changed, 122 insertions(+), 135 deletions(-) diff --git a/amazoncorretto/10.0/jdk11-alpine/Dockerfile b/amazoncorretto/10.0/jdk11-alpine/Dockerfile index 2ae1d8cc..7b50110d 100644 --- a/amazoncorretto/10.0/jdk11-alpine/Dockerfile +++ b/amazoncorretto/10.0/jdk11-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/10.0/jdk11/Dockerfile b/amazoncorretto/10.0/jdk11/Dockerfile index 58e9ec59..9978f5ed 100644 --- a/amazoncorretto/10.0/jdk11/Dockerfile +++ b/amazoncorretto/10.0/jdk11/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/10.0/jdk17-alpine/Dockerfile b/amazoncorretto/10.0/jdk17-alpine/Dockerfile index 98053552..ae21abb1 100644 --- a/amazoncorretto/10.0/jdk17-alpine/Dockerfile +++ b/amazoncorretto/10.0/jdk17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/10.0/jdk17/Dockerfile b/amazoncorretto/10.0/jdk17/Dockerfile index f789e37a..8db896b2 100644 --- a/amazoncorretto/10.0/jdk17/Dockerfile +++ b/amazoncorretto/10.0/jdk17/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/10.0/jdk21-alpine/Dockerfile b/amazoncorretto/10.0/jdk21-alpine/Dockerfile index f0e5aadc..857c736e 100644 --- a/amazoncorretto/10.0/jdk21-alpine/Dockerfile +++ b/amazoncorretto/10.0/jdk21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/10.0/jdk21/Dockerfile b/amazoncorretto/10.0/jdk21/Dockerfile index f2953ae6..a6277836 100644 --- a/amazoncorretto/10.0/jdk21/Dockerfile +++ b/amazoncorretto/10.0/jdk21/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/11.0/jdk11-alpine/Dockerfile b/amazoncorretto/11.0/jdk11-alpine/Dockerfile index 3800493c..bc578ca2 100644 --- a/amazoncorretto/11.0/jdk11-alpine/Dockerfile +++ b/amazoncorretto/11.0/jdk11-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/11.0/jdk11/Dockerfile b/amazoncorretto/11.0/jdk11/Dockerfile index 63a9eb5a..a1bc02b7 100644 --- a/amazoncorretto/11.0/jdk11/Dockerfile +++ b/amazoncorretto/11.0/jdk11/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/11.0/jdk17-alpine/Dockerfile b/amazoncorretto/11.0/jdk17-alpine/Dockerfile index 458b975b..00eb4b5a 100644 --- a/amazoncorretto/11.0/jdk17-alpine/Dockerfile +++ b/amazoncorretto/11.0/jdk17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/11.0/jdk17/Dockerfile b/amazoncorretto/11.0/jdk17/Dockerfile index 680db1d0..39df4ea2 100644 --- a/amazoncorretto/11.0/jdk17/Dockerfile +++ b/amazoncorretto/11.0/jdk17/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/11.0/jdk21-alpine/Dockerfile b/amazoncorretto/11.0/jdk21-alpine/Dockerfile index 21492c8f..af788532 100644 --- a/amazoncorretto/11.0/jdk21-alpine/Dockerfile +++ b/amazoncorretto/11.0/jdk21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/11.0/jdk21/Dockerfile b/amazoncorretto/11.0/jdk21/Dockerfile index e8453326..c3f0378d 100644 --- a/amazoncorretto/11.0/jdk21/Dockerfile +++ b/amazoncorretto/11.0/jdk21/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/12.0/jdk17-alpine/Dockerfile b/amazoncorretto/12.0/jdk17-alpine/Dockerfile index 9c439de4..05aae183 100644 --- a/amazoncorretto/12.0/jdk17-alpine/Dockerfile +++ b/amazoncorretto/12.0/jdk17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/12.0/jdk17/Dockerfile b/amazoncorretto/12.0/jdk17/Dockerfile index e123d267..74b466c9 100644 --- a/amazoncorretto/12.0/jdk17/Dockerfile +++ b/amazoncorretto/12.0/jdk17/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/12.0/jdk21-alpine/Dockerfile b/amazoncorretto/12.0/jdk21-alpine/Dockerfile index 36c099a3..10154a28 100644 --- a/amazoncorretto/12.0/jdk21-alpine/Dockerfile +++ b/amazoncorretto/12.0/jdk21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/12.0/jdk21/Dockerfile b/amazoncorretto/12.0/jdk21/Dockerfile index 1c302ab3..d5b4f0b2 100644 --- a/amazoncorretto/12.0/jdk21/Dockerfile +++ b/amazoncorretto/12.0/jdk21/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/9.4/jdk11-alpine/Dockerfile b/amazoncorretto/9.4/jdk11-alpine/Dockerfile index ccc72208..a0afbc96 100644 --- a/amazoncorretto/9.4/jdk11-alpine/Dockerfile +++ b/amazoncorretto/9.4/jdk11-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/9.4/jdk11/Dockerfile b/amazoncorretto/9.4/jdk11/Dockerfile index f5aa70db..21077799 100644 --- a/amazoncorretto/9.4/jdk11/Dockerfile +++ b/amazoncorretto/9.4/jdk11/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/9.4/jdk17-alpine/Dockerfile b/amazoncorretto/9.4/jdk17-alpine/Dockerfile index 17a8bd22..ef8fdc59 100644 --- a/amazoncorretto/9.4/jdk17-alpine/Dockerfile +++ b/amazoncorretto/9.4/jdk17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/9.4/jdk17/Dockerfile b/amazoncorretto/9.4/jdk17/Dockerfile index 374fdaa5..926358a7 100644 --- a/amazoncorretto/9.4/jdk17/Dockerfile +++ b/amazoncorretto/9.4/jdk17/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/9.4/jdk21-alpine/Dockerfile b/amazoncorretto/9.4/jdk21-alpine/Dockerfile index feb526c5..73b314df 100644 --- a/amazoncorretto/9.4/jdk21-alpine/Dockerfile +++ b/amazoncorretto/9.4/jdk21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/9.4/jdk21/Dockerfile b/amazoncorretto/9.4/jdk21/Dockerfile index 4b5c691a..9a4617df 100644 --- a/amazoncorretto/9.4/jdk21/Dockerfile +++ b/amazoncorretto/9.4/jdk21/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/amazoncorretto/9.4/jdk8-alpine/Dockerfile b/amazoncorretto/9.4/jdk8-alpine/Dockerfile index fabe3995..8ecfe0fb 100644 --- a/amazoncorretto/9.4/jdk8-alpine/Dockerfile +++ b/amazoncorretto/9.4/jdk8-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/9.4/jdk8/Dockerfile b/amazoncorretto/9.4/jdk8/Dockerfile index 3c9f4692..1b6f348c 100644 --- a/amazoncorretto/9.4/jdk8/Dockerfile +++ b/amazoncorretto/9.4/jdk8/Dockerfile @@ -70,7 +70,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk-alpine/10.0/jdk11/Dockerfile b/azul/zulu-openjdk-alpine/10.0/jdk11/Dockerfile index 59061065..6b8ae348 100644 --- a/azul/zulu-openjdk-alpine/10.0/jdk11/Dockerfile +++ b/azul/zulu-openjdk-alpine/10.0/jdk11/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/10.0/jdk17/Dockerfile b/azul/zulu-openjdk-alpine/10.0/jdk17/Dockerfile index 571ac713..f3f73e54 100644 --- a/azul/zulu-openjdk-alpine/10.0/jdk17/Dockerfile +++ b/azul/zulu-openjdk-alpine/10.0/jdk17/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/10.0/jdk21/Dockerfile b/azul/zulu-openjdk-alpine/10.0/jdk21/Dockerfile index bdd68398..95c3a92d 100644 --- a/azul/zulu-openjdk-alpine/10.0/jdk21/Dockerfile +++ b/azul/zulu-openjdk-alpine/10.0/jdk21/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/11.0/jdk11/Dockerfile b/azul/zulu-openjdk-alpine/11.0/jdk11/Dockerfile index 788d161c..5339d06d 100644 --- a/azul/zulu-openjdk-alpine/11.0/jdk11/Dockerfile +++ b/azul/zulu-openjdk-alpine/11.0/jdk11/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/11.0/jdk17/Dockerfile b/azul/zulu-openjdk-alpine/11.0/jdk17/Dockerfile index e97e320e..d53d909c 100644 --- a/azul/zulu-openjdk-alpine/11.0/jdk17/Dockerfile +++ b/azul/zulu-openjdk-alpine/11.0/jdk17/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/11.0/jdk21/Dockerfile b/azul/zulu-openjdk-alpine/11.0/jdk21/Dockerfile index a95c2e15..bf5badce 100644 --- a/azul/zulu-openjdk-alpine/11.0/jdk21/Dockerfile +++ b/azul/zulu-openjdk-alpine/11.0/jdk21/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/12.0/jdk17/Dockerfile b/azul/zulu-openjdk-alpine/12.0/jdk17/Dockerfile index a8b4479c..078e40cb 100644 --- a/azul/zulu-openjdk-alpine/12.0/jdk17/Dockerfile +++ b/azul/zulu-openjdk-alpine/12.0/jdk17/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/12.0/jdk21/Dockerfile b/azul/zulu-openjdk-alpine/12.0/jdk21/Dockerfile index 2b313519..be87dc9f 100644 --- a/azul/zulu-openjdk-alpine/12.0/jdk21/Dockerfile +++ b/azul/zulu-openjdk-alpine/12.0/jdk21/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/9.4/jdk11/Dockerfile b/azul/zulu-openjdk-alpine/9.4/jdk11/Dockerfile index 57c8883e..c95d97c0 100644 --- a/azul/zulu-openjdk-alpine/9.4/jdk11/Dockerfile +++ b/azul/zulu-openjdk-alpine/9.4/jdk11/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/9.4/jdk17/Dockerfile b/azul/zulu-openjdk-alpine/9.4/jdk17/Dockerfile index 0738f369..ee9fd198 100644 --- a/azul/zulu-openjdk-alpine/9.4/jdk17/Dockerfile +++ b/azul/zulu-openjdk-alpine/9.4/jdk17/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/9.4/jdk21/Dockerfile b/azul/zulu-openjdk-alpine/9.4/jdk21/Dockerfile index 3ebc99c6..dd20d575 100644 --- a/azul/zulu-openjdk-alpine/9.4/jdk21/Dockerfile +++ b/azul/zulu-openjdk-alpine/9.4/jdk21/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk-alpine/9.4/jdk8/Dockerfile b/azul/zulu-openjdk-alpine/9.4/jdk8/Dockerfile index d86c1a3e..aa9f971f 100644 --- a/azul/zulu-openjdk-alpine/9.4/jdk8/Dockerfile +++ b/azul/zulu-openjdk-alpine/9.4/jdk8/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/azul/zulu-openjdk/10.0/jdk11/Dockerfile b/azul/zulu-openjdk/10.0/jdk11/Dockerfile index 83bc5eeb..53b8de7e 100644 --- a/azul/zulu-openjdk/10.0/jdk11/Dockerfile +++ b/azul/zulu-openjdk/10.0/jdk11/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/10.0/jdk17/Dockerfile b/azul/zulu-openjdk/10.0/jdk17/Dockerfile index ef785b62..4459711b 100644 --- a/azul/zulu-openjdk/10.0/jdk17/Dockerfile +++ b/azul/zulu-openjdk/10.0/jdk17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/10.0/jdk21/Dockerfile b/azul/zulu-openjdk/10.0/jdk21/Dockerfile index 8068e2c0..788ce47e 100644 --- a/azul/zulu-openjdk/10.0/jdk21/Dockerfile +++ b/azul/zulu-openjdk/10.0/jdk21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/11.0/jdk11/Dockerfile b/azul/zulu-openjdk/11.0/jdk11/Dockerfile index 37a257bb..f8168e79 100644 --- a/azul/zulu-openjdk/11.0/jdk11/Dockerfile +++ b/azul/zulu-openjdk/11.0/jdk11/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/11.0/jdk17/Dockerfile b/azul/zulu-openjdk/11.0/jdk17/Dockerfile index b83f0b34..fee6e9c1 100644 --- a/azul/zulu-openjdk/11.0/jdk17/Dockerfile +++ b/azul/zulu-openjdk/11.0/jdk17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/11.0/jdk21/Dockerfile b/azul/zulu-openjdk/11.0/jdk21/Dockerfile index 36d7dfb3..0b8b0a08 100644 --- a/azul/zulu-openjdk/11.0/jdk21/Dockerfile +++ b/azul/zulu-openjdk/11.0/jdk21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/12.0/jdk17/Dockerfile b/azul/zulu-openjdk/12.0/jdk17/Dockerfile index 772b5e88..25968247 100644 --- a/azul/zulu-openjdk/12.0/jdk17/Dockerfile +++ b/azul/zulu-openjdk/12.0/jdk17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/12.0/jdk21/Dockerfile b/azul/zulu-openjdk/12.0/jdk21/Dockerfile index 1f3e51ae..56280994 100644 --- a/azul/zulu-openjdk/12.0/jdk21/Dockerfile +++ b/azul/zulu-openjdk/12.0/jdk21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/9.4/jdk11/Dockerfile b/azul/zulu-openjdk/9.4/jdk11/Dockerfile index c70398b2..8b804d98 100644 --- a/azul/zulu-openjdk/9.4/jdk11/Dockerfile +++ b/azul/zulu-openjdk/9.4/jdk11/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/9.4/jdk17/Dockerfile b/azul/zulu-openjdk/9.4/jdk17/Dockerfile index b6a3b95f..456167e6 100644 --- a/azul/zulu-openjdk/9.4/jdk17/Dockerfile +++ b/azul/zulu-openjdk/9.4/jdk17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/9.4/jdk21/Dockerfile b/azul/zulu-openjdk/9.4/jdk21/Dockerfile index e1cac4c2..42af3297 100644 --- a/azul/zulu-openjdk/9.4/jdk21/Dockerfile +++ b/azul/zulu-openjdk/9.4/jdk21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/azul/zulu-openjdk/9.4/jdk8/Dockerfile b/azul/zulu-openjdk/9.4/jdk8/Dockerfile index dadf55cf..c89ea372 100644 --- a/azul/zulu-openjdk/9.4/jdk8/Dockerfile +++ b/azul/zulu-openjdk/9.4/jdk8/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/baseDockerfile-alpine b/baseDockerfile-alpine index 75d0ae7f..d21146ea 100644 --- a/baseDockerfile-alpine +++ b/baseDockerfile-alpine @@ -30,7 +30,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/baseDockerfile-amazoncorretto b/baseDockerfile-amazoncorretto index c6eedf76..bfdd202c 100644 --- a/baseDockerfile-amazoncorretto +++ b/baseDockerfile-amazoncorretto @@ -69,7 +69,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/baseDockerfile-slim b/baseDockerfile-slim index 886106af..a66e674c 100644 --- a/baseDockerfile-slim +++ b/baseDockerfile-slim @@ -37,7 +37,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -73,6 +73,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -83,7 +84,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/10.0/jdk11-alpine/Dockerfile b/eclipse-temurin/10.0/jdk11-alpine/Dockerfile index 8c123b22..6cd19356 100644 --- a/eclipse-temurin/10.0/jdk11-alpine/Dockerfile +++ b/eclipse-temurin/10.0/jdk11-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/10.0/jdk11/Dockerfile b/eclipse-temurin/10.0/jdk11/Dockerfile index ad491b25..b406e1c7 100644 --- a/eclipse-temurin/10.0/jdk11/Dockerfile +++ b/eclipse-temurin/10.0/jdk11/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/10.0/jdk17-alpine/Dockerfile b/eclipse-temurin/10.0/jdk17-alpine/Dockerfile index babd76a4..c65c07b4 100644 --- a/eclipse-temurin/10.0/jdk17-alpine/Dockerfile +++ b/eclipse-temurin/10.0/jdk17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/10.0/jdk17/Dockerfile b/eclipse-temurin/10.0/jdk17/Dockerfile index 8f566d7f..703c31a7 100644 --- a/eclipse-temurin/10.0/jdk17/Dockerfile +++ b/eclipse-temurin/10.0/jdk17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/10.0/jdk21-alpine/Dockerfile b/eclipse-temurin/10.0/jdk21-alpine/Dockerfile index e954d38b..53f88bb3 100644 --- a/eclipse-temurin/10.0/jdk21-alpine/Dockerfile +++ b/eclipse-temurin/10.0/jdk21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/10.0/jdk21/Dockerfile b/eclipse-temurin/10.0/jdk21/Dockerfile index f8b1c438..66b391bb 100644 --- a/eclipse-temurin/10.0/jdk21/Dockerfile +++ b/eclipse-temurin/10.0/jdk21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/10.0/jre11-alpine/Dockerfile b/eclipse-temurin/10.0/jre11-alpine/Dockerfile index f7407b73..ad0f85f3 100644 --- a/eclipse-temurin/10.0/jre11-alpine/Dockerfile +++ b/eclipse-temurin/10.0/jre11-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/10.0/jre11/Dockerfile b/eclipse-temurin/10.0/jre11/Dockerfile index 7586731d..0c79ba0f 100644 --- a/eclipse-temurin/10.0/jre11/Dockerfile +++ b/eclipse-temurin/10.0/jre11/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/10.0/jre17-alpine/Dockerfile b/eclipse-temurin/10.0/jre17-alpine/Dockerfile index 340c62df..d2788261 100644 --- a/eclipse-temurin/10.0/jre17-alpine/Dockerfile +++ b/eclipse-temurin/10.0/jre17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/10.0/jre17/Dockerfile b/eclipse-temurin/10.0/jre17/Dockerfile index 4fdb12eb..1597807a 100644 --- a/eclipse-temurin/10.0/jre17/Dockerfile +++ b/eclipse-temurin/10.0/jre17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/10.0/jre21-alpine/Dockerfile b/eclipse-temurin/10.0/jre21-alpine/Dockerfile index 1dfb1089..bb7bc0e3 100644 --- a/eclipse-temurin/10.0/jre21-alpine/Dockerfile +++ b/eclipse-temurin/10.0/jre21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/10.0/jre21/Dockerfile b/eclipse-temurin/10.0/jre21/Dockerfile index 31d075b2..919b565d 100644 --- a/eclipse-temurin/10.0/jre21/Dockerfile +++ b/eclipse-temurin/10.0/jre21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/11.0/jdk11-alpine/Dockerfile b/eclipse-temurin/11.0/jdk11-alpine/Dockerfile index 21e080d7..a6007bd8 100644 --- a/eclipse-temurin/11.0/jdk11-alpine/Dockerfile +++ b/eclipse-temurin/11.0/jdk11-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/11.0/jdk11/Dockerfile b/eclipse-temurin/11.0/jdk11/Dockerfile index 581c6fc3..f69964c8 100644 --- a/eclipse-temurin/11.0/jdk11/Dockerfile +++ b/eclipse-temurin/11.0/jdk11/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/11.0/jdk17-alpine/Dockerfile b/eclipse-temurin/11.0/jdk17-alpine/Dockerfile index f0b12909..f3f6ba17 100644 --- a/eclipse-temurin/11.0/jdk17-alpine/Dockerfile +++ b/eclipse-temurin/11.0/jdk17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/11.0/jdk17/Dockerfile b/eclipse-temurin/11.0/jdk17/Dockerfile index 37709d98..9e127e47 100644 --- a/eclipse-temurin/11.0/jdk17/Dockerfile +++ b/eclipse-temurin/11.0/jdk17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/11.0/jdk21-alpine/Dockerfile b/eclipse-temurin/11.0/jdk21-alpine/Dockerfile index 862ba45f..93d7ef20 100644 --- a/eclipse-temurin/11.0/jdk21-alpine/Dockerfile +++ b/eclipse-temurin/11.0/jdk21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/11.0/jdk21/Dockerfile b/eclipse-temurin/11.0/jdk21/Dockerfile index 244e2f2b..231d9949 100644 --- a/eclipse-temurin/11.0/jdk21/Dockerfile +++ b/eclipse-temurin/11.0/jdk21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/11.0/jre11-alpine/Dockerfile b/eclipse-temurin/11.0/jre11-alpine/Dockerfile index d055200f..be9e9adc 100644 --- a/eclipse-temurin/11.0/jre11-alpine/Dockerfile +++ b/eclipse-temurin/11.0/jre11-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/11.0/jre11/Dockerfile b/eclipse-temurin/11.0/jre11/Dockerfile index 63b531cf..89d7006e 100644 --- a/eclipse-temurin/11.0/jre11/Dockerfile +++ b/eclipse-temurin/11.0/jre11/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/11.0/jre17-alpine/Dockerfile b/eclipse-temurin/11.0/jre17-alpine/Dockerfile index 36841a7f..5303abd9 100644 --- a/eclipse-temurin/11.0/jre17-alpine/Dockerfile +++ b/eclipse-temurin/11.0/jre17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/11.0/jre17/Dockerfile b/eclipse-temurin/11.0/jre17/Dockerfile index 4e35ea5d..22be3be7 100644 --- a/eclipse-temurin/11.0/jre17/Dockerfile +++ b/eclipse-temurin/11.0/jre17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/11.0/jre21-alpine/Dockerfile b/eclipse-temurin/11.0/jre21-alpine/Dockerfile index fd038fda..d6469c67 100644 --- a/eclipse-temurin/11.0/jre21-alpine/Dockerfile +++ b/eclipse-temurin/11.0/jre21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/11.0/jre21/Dockerfile b/eclipse-temurin/11.0/jre21/Dockerfile index 693a4e75..e657d8e9 100644 --- a/eclipse-temurin/11.0/jre21/Dockerfile +++ b/eclipse-temurin/11.0/jre21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/12.0/jdk17-alpine/Dockerfile b/eclipse-temurin/12.0/jdk17-alpine/Dockerfile index 34e4c259..5d5311ec 100644 --- a/eclipse-temurin/12.0/jdk17-alpine/Dockerfile +++ b/eclipse-temurin/12.0/jdk17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/12.0/jdk17/Dockerfile b/eclipse-temurin/12.0/jdk17/Dockerfile index 37d4b9aa..09d67c09 100644 --- a/eclipse-temurin/12.0/jdk17/Dockerfile +++ b/eclipse-temurin/12.0/jdk17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/12.0/jdk21-alpine/Dockerfile b/eclipse-temurin/12.0/jdk21-alpine/Dockerfile index b3a3749f..5120bbab 100644 --- a/eclipse-temurin/12.0/jdk21-alpine/Dockerfile +++ b/eclipse-temurin/12.0/jdk21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/12.0/jdk21/Dockerfile b/eclipse-temurin/12.0/jdk21/Dockerfile index 0083b466..ce75332f 100644 --- a/eclipse-temurin/12.0/jdk21/Dockerfile +++ b/eclipse-temurin/12.0/jdk21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/12.0/jre17-alpine/Dockerfile b/eclipse-temurin/12.0/jre17-alpine/Dockerfile index c49c14d8..28c5f80a 100644 --- a/eclipse-temurin/12.0/jre17-alpine/Dockerfile +++ b/eclipse-temurin/12.0/jre17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/12.0/jre17/Dockerfile b/eclipse-temurin/12.0/jre17/Dockerfile index f20a86a7..3126f72f 100644 --- a/eclipse-temurin/12.0/jre17/Dockerfile +++ b/eclipse-temurin/12.0/jre17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/12.0/jre21-alpine/Dockerfile b/eclipse-temurin/12.0/jre21-alpine/Dockerfile index 1bc21ab7..d7f86e1c 100644 --- a/eclipse-temurin/12.0/jre21-alpine/Dockerfile +++ b/eclipse-temurin/12.0/jre21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/12.0/jre21/Dockerfile b/eclipse-temurin/12.0/jre21/Dockerfile index 7abc3366..d0ab3bb2 100644 --- a/eclipse-temurin/12.0/jre21/Dockerfile +++ b/eclipse-temurin/12.0/jre21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/9.4/jdk11-alpine/Dockerfile b/eclipse-temurin/9.4/jdk11-alpine/Dockerfile index 6bc53a1b..8700c28f 100644 --- a/eclipse-temurin/9.4/jdk11-alpine/Dockerfile +++ b/eclipse-temurin/9.4/jdk11-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/9.4/jdk11/Dockerfile b/eclipse-temurin/9.4/jdk11/Dockerfile index 90719307..9976fcda 100644 --- a/eclipse-temurin/9.4/jdk11/Dockerfile +++ b/eclipse-temurin/9.4/jdk11/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/9.4/jdk17-alpine/Dockerfile b/eclipse-temurin/9.4/jdk17-alpine/Dockerfile index f929fb44..0c2abb3e 100644 --- a/eclipse-temurin/9.4/jdk17-alpine/Dockerfile +++ b/eclipse-temurin/9.4/jdk17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/9.4/jdk17/Dockerfile b/eclipse-temurin/9.4/jdk17/Dockerfile index e7847425..c12143da 100644 --- a/eclipse-temurin/9.4/jdk17/Dockerfile +++ b/eclipse-temurin/9.4/jdk17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/9.4/jdk21-alpine/Dockerfile b/eclipse-temurin/9.4/jdk21-alpine/Dockerfile index 1d4f7ea0..952db694 100644 --- a/eclipse-temurin/9.4/jdk21-alpine/Dockerfile +++ b/eclipse-temurin/9.4/jdk21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/9.4/jdk21/Dockerfile b/eclipse-temurin/9.4/jdk21/Dockerfile index 1c6cfc8d..7b846b61 100644 --- a/eclipse-temurin/9.4/jdk21/Dockerfile +++ b/eclipse-temurin/9.4/jdk21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/9.4/jdk8/Dockerfile b/eclipse-temurin/9.4/jdk8/Dockerfile index 25df90ec..e6cecd3d 100644 --- a/eclipse-temurin/9.4/jdk8/Dockerfile +++ b/eclipse-temurin/9.4/jdk8/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/9.4/jre11-alpine/Dockerfile b/eclipse-temurin/9.4/jre11-alpine/Dockerfile index 398add7a..f4343a41 100644 --- a/eclipse-temurin/9.4/jre11-alpine/Dockerfile +++ b/eclipse-temurin/9.4/jre11-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/9.4/jre11/Dockerfile b/eclipse-temurin/9.4/jre11/Dockerfile index 05ffbb29..6c5e4f21 100644 --- a/eclipse-temurin/9.4/jre11/Dockerfile +++ b/eclipse-temurin/9.4/jre11/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/9.4/jre17-alpine/Dockerfile b/eclipse-temurin/9.4/jre17-alpine/Dockerfile index 102ca408..093d7605 100644 --- a/eclipse-temurin/9.4/jre17-alpine/Dockerfile +++ b/eclipse-temurin/9.4/jre17-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/9.4/jre17/Dockerfile b/eclipse-temurin/9.4/jre17/Dockerfile index ab22506e..abe1c231 100644 --- a/eclipse-temurin/9.4/jre17/Dockerfile +++ b/eclipse-temurin/9.4/jre17/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/9.4/jre21-alpine/Dockerfile b/eclipse-temurin/9.4/jre21-alpine/Dockerfile index 1da9da82..f4fceca6 100644 --- a/eclipse-temurin/9.4/jre21-alpine/Dockerfile +++ b/eclipse-temurin/9.4/jre21-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/9.4/jre21/Dockerfile b/eclipse-temurin/9.4/jre21/Dockerfile index 59d8ec79..dc539e92 100644 --- a/eclipse-temurin/9.4/jre21/Dockerfile +++ b/eclipse-temurin/9.4/jre21/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ # diff --git a/eclipse-temurin/9.4/jre8-alpine/Dockerfile b/eclipse-temurin/9.4/jre8-alpine/Dockerfile index ea8beea4..72b65921 100644 --- a/eclipse-temurin/9.4/jre8-alpine/Dockerfile +++ b/eclipse-temurin/9.4/jre8-alpine/Dockerfile @@ -31,7 +31,7 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utils needed to verify keys - apk add --no-cache gnupg curl ; \ + apk add --no-cache gnupg2 curl ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/eclipse-temurin/9.4/jre8/Dockerfile b/eclipse-temurin/9.4/jre8/Dockerfile index 77cbeb5a..48443d7e 100644 --- a/eclipse-temurin/9.4/jre8/Dockerfile +++ b/eclipse-temurin/9.4/jre8/Dockerfile @@ -38,7 +38,7 @@ RUN set -xe ; \ apt-get install -y --no-install-recommends \ ca-certificates \ p11-kit \ - gnupg \ + gnupg2 \ curl \ ; \ # @@ -74,6 +74,7 @@ RUN set -xe ; \ groupadd -r jetty && useradd -r -g jetty jetty ; \ chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" ; \ usermod -d $JETTY_BASE jetty ; \ + gpgconf --kill all ; \ # # Cleanup any apt apt-mark auto '.*' > /dev/null ; \ @@ -84,7 +85,6 @@ RUN set -xe ; \ # Cleanup rm -rf /tmp/hsperfdata_root ; \ rm -fr $JETTY_HOME/jetty.tar.gz* ; \ - gpgconf --kill all ; \ rm -fr /jetty-keys $GNUPGHOME ; \ rm -rf /tmp/hsperfdata_root ; \ #