From 6c6f002bc9c29e32b2ca57b8b8cfeaa776e27ca9 Mon Sep 17 00:00:00 2001 From: Malfurious Date: Wed, 19 Jun 2024 19:37:38 -0400 Subject: gpgverify: Fix lingering lockfile bug Using multiple RUN directives, it is possible for later gpg commands to hang up on a lingering lockfile from previous commands. This is especially a problem if a build fails during this stage or cached layers are reused. Signed-off-by: Malfurious --- cychedelic-gpgverify-v0.2.0.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cychedelic-gpgverify-v0.2.0.patch b/cychedelic-gpgverify-v0.2.0.patch index 5fee656..517c9d1 100644 --- a/cychedelic-gpgverify-v0.2.0.patch +++ b/cychedelic-gpgverify-v0.2.0.patch @@ -1,4 +1,4 @@ -From ddcb46c0f06f1df6f4a48785bbb2751f72543de6 Mon Sep 17 00:00:00 2001 +From ecb7bb745cc88bb2b54f499dca48089a5ae27fdf Mon Sep 17 00:00:00 2001 From: Malfurious Date: Thu, 23 Nov 2023 09:44:06 -0500 Subject: [PATCH] patch: gpgverify @@ -34,7 +34,7 @@ that happen to point to it as well. create mode 100644 acid/gpgkeys/.ownertrust.txt diff --git a/acid/Dockerfile b/acid/Dockerfile -index 7eecebe..f44a4e5 100644 +index 7eecebe..da68873 100644 --- a/acid/Dockerfile +++ b/acid/Dockerfile @@ -5,9 +5,15 @@ RUN apk --no-cache add \ @@ -49,10 +49,10 @@ index 7eecebe..f44a4e5 100644 WORKDIR /app ENV PATH="${PATH}:/app" COPY . . -+RUN cat gpgkeys/* | gpg --import --quiet -+RUN gpg --import-ownertrust --quiet