From 4919299985912762de184d0fa8048df6402300a1 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Mon, 11 Dec 2023 16:20:33 +1100 Subject: [PATCH] use gpgconf --kill all to prevent build failures Signed-off-by: Lachlan Roberts --- baseDockerfile | 1 + baseDockerfile-alpine | 1 + baseDockerfile-amazoncorretto | 1 + baseDockerfile-slim | 1 + 4 files changed, 4 insertions(+) diff --git a/baseDockerfile b/baseDockerfile index 96faf886..eddf9efc 100644 --- a/baseDockerfile +++ b/baseDockerfile @@ -66,6 +66,7 @@ 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 ea16ebea..75d0ae7f 100644 --- a/baseDockerfile-alpine +++ b/baseDockerfile-alpine @@ -67,6 +67,7 @@ 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-amazoncorretto b/baseDockerfile-amazoncorretto index bfdd202c..c6eedf76 100644 --- a/baseDockerfile-amazoncorretto +++ b/baseDockerfile-amazoncorretto @@ -69,6 +69,7 @@ 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 d5844eff..886106af 100644 --- a/baseDockerfile-slim +++ b/baseDockerfile-slim @@ -83,6 +83,7 @@ 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 ; \ #