fix version of gnupg2

Signed-off-by: Lachlan Roberts <[email protected]>
jetty · Dec 2, 2024 · c4350bd · c4350bd
1 parent b5b0038
commit c4350bd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 ; \