diff options
| author | Malfurious <m@lfurio.us> | 2024-06-19 19:37:38 -0400 |
|---|---|---|
| committer | Malfurious <m@lfurio.us> | 2024-06-19 19:37:38 -0400 |
| commit | 6c6f002bc9c29e32b2ca57b8b8cfeaa776e27ca9 (patch) | |
| tree | 4d23d2b8bd58c7d7220a27c13512b3fc5402f0eb | |
| parent | 48e68d4efeac35a96426e4e2de221d4b006d199e (diff) | |
| download | cychedelic-6c6f002bc9c29e32b2ca57b8b8cfeaa776e27ca9.tar.gz cychedelic-6c6f002bc9c29e32b2ca57b8b8cfeaa776e27ca9.zip | |
gpgverify: Fix lingering lockfile bugpatches
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 <m@lfurio.us>
| -rw-r--r-- | cychedelic-gpgverify-v0.2.0.patch | 14 |
1 files 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 <m@lfurio.us> 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 <gpgkeys/.ownertrust.txt -+RUN gpg --check-trustdb -+RUN rm -f /root/.gnupg/public-keys.d/pubring.db.lock ++RUN cat gpgkeys/* | gpg --import --quiet \ ++ && gpg --import-ownertrust --quiet <gpgkeys/.ownertrust.txt \ ++ && gpg --check-trustdb \ ++ && rm -f /root/.gnupg/public-keys.d/pubring.db.lock CMD ["acid"] diff --git a/acid/acid b/acid/acid index a134d34..c2d2f24 100755 @@ -125,5 +125,5 @@ diff --git a/acid/gpgkeys/.ownertrust.txt b/acid/gpgkeys/.ownertrust.txt new file mode 100644 index 0000000..e69de29 -- -2.42.0 +2.44.0 |