From c4350bd7b5dd939757e606a110d47897d5192f3e Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 2 Dec 2024 18:17:04 +1100 Subject: [PATCH] fix version of gnupg2 Signed-off-by: Lachlan Roberts --- amazoncorretto/12.0/jdk17-al2023/Dockerfile | 3 ++- amazoncorretto/12.0/jdk21-al2023/Dockerfile | 3 ++- amazoncorretto/12.0/jdk23-al2023/Dockerfile | 3 ++- baseDockerfile-amazoncorretto | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/amazoncorretto/12.0/jdk17-al2023/Dockerfile b/amazoncorretto/12.0/jdk17-al2023/Dockerfile index 7796cbb0..18f57952 100644 --- a/amazoncorretto/12.0/jdk17-al2023/Dockerfile +++ b/amazoncorretto/12.0/jdk17-al2023/Dockerfile @@ -32,7 +32,8 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utilities needed for setup. - yum install -y shadow-utils tar xz gzip which && yum clean all ; \ + yum install -y shadow-utils tar xz gzip which && yum clean all ; \ + command -v dnf && dnf swap -y gnupg2-minimal gnupg2-full && dnf clean all ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/12.0/jdk21-al2023/Dockerfile b/amazoncorretto/12.0/jdk21-al2023/Dockerfile index c9380f86..a6cb5ce3 100644 --- a/amazoncorretto/12.0/jdk21-al2023/Dockerfile +++ b/amazoncorretto/12.0/jdk21-al2023/Dockerfile @@ -32,7 +32,8 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utilities needed for setup. - yum install -y shadow-utils tar xz gzip which && yum clean all ; \ + yum install -y shadow-utils tar xz gzip which && yum clean all ; \ + command -v dnf && dnf swap -y gnupg2-minimal gnupg2-full && dnf clean all ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/amazoncorretto/12.0/jdk23-al2023/Dockerfile b/amazoncorretto/12.0/jdk23-al2023/Dockerfile index b4e53425..aecee5fe 100644 --- a/amazoncorretto/12.0/jdk23-al2023/Dockerfile +++ b/amazoncorretto/12.0/jdk23-al2023/Dockerfile @@ -32,7 +32,8 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utilities needed for setup. - yum install -y shadow-utils tar xz gzip which && yum clean all ; \ + yum install -y shadow-utils tar xz gzip which && yum clean all ; \ + command -v dnf && dnf swap -y gnupg2-minimal gnupg2-full && dnf clean all ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \ diff --git a/baseDockerfile-amazoncorretto b/baseDockerfile-amazoncorretto index f7270c2a..c8853ba2 100644 --- a/baseDockerfile-amazoncorretto +++ b/baseDockerfile-amazoncorretto @@ -31,7 +31,8 @@ RUN set -xe ; \ mkdir -p $TMPDIR ; \ # # Install utilities needed for setup. - yum install -y shadow-utils tar xz gzip which && yum clean all ; \ + yum install -y shadow-utils tar xz gzip which && yum clean all ; \ + command -v dnf && dnf swap -y gnupg2-minimal gnupg2-full && dnf clean all ; \ # # fetch GPG keys export GNUPGHOME=/jetty-keys ; \