From 3f6b74c19cf019cd2b3d96b44a21003245040f2c Mon Sep 17 00:00:00 2001
From: Leonard Jonathan Oh <leonardjonathanoh@live.com>
Date: Fri, 15 Sep 2023 04:06:28 +0000
Subject: [PATCH] Fix: Remove `/root/.gnupg` after removing `gnupg`

---
 generate/templates/Dockerfile.ps1 | 4 ++--
 variants/v3.0.1/Dockerfile        | 4 ++--
 variants/v3.0.2/Dockerfile        | 4 ++--
 variants/v3.0.3/Dockerfile        | 4 ++--
 variants/v3.0.4/Dockerfile        | 4 ++--
 variants/v3.0.5/Dockerfile        | 4 ++--
 variants/v3.0.6/Dockerfile        | 4 ++--
 variants/v3.0.7/Dockerfile        | 4 ++--
 variants/v3.0.8/Dockerfile        | 4 ++--
 variants/v3.0.9/Dockerfile        | 4 ++--
 variants/v3.1.0/Dockerfile        | 4 ++--
 variants/v3.1.1/Dockerfile        | 4 ++--
 variants/v3.1.2/Dockerfile        | 4 ++--
 variants/v3.1.3/Dockerfile        | 4 ++--
 variants/v3.1.4/Dockerfile        | 4 ++--
 variants/v3.1.5/Dockerfile        | 4 ++--
 variants/v3.1.6/Dockerfile        | 4 ++--
 17 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
index ece2e4f..e7efc44 100644
--- a/generate/templates/Dockerfile.ps1
+++ b/generate/templates/Dockerfile.ps1
@@ -45,8 +45,8 @@ RUN set -eux; \
     \
     rm -fv "`$FILE"; \
     rm -fv "`$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.0.1/Dockerfile b/variants/v3.0.1/Dockerfile
index 47b6449..eee9f66 100644
--- a/variants/v3.0.1/Dockerfile
+++ b/variants/v3.0.1/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.0.2/Dockerfile b/variants/v3.0.2/Dockerfile
index ece48b9..8435c8b 100644
--- a/variants/v3.0.2/Dockerfile
+++ b/variants/v3.0.2/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.0.3/Dockerfile b/variants/v3.0.3/Dockerfile
index e9fc080..9cb6e6d 100644
--- a/variants/v3.0.3/Dockerfile
+++ b/variants/v3.0.3/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.0.4/Dockerfile b/variants/v3.0.4/Dockerfile
index ab0c573..d51c29a 100644
--- a/variants/v3.0.4/Dockerfile
+++ b/variants/v3.0.4/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.0.5/Dockerfile b/variants/v3.0.5/Dockerfile
index 1110c64..83a8ad6 100644
--- a/variants/v3.0.5/Dockerfile
+++ b/variants/v3.0.5/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.0.6/Dockerfile b/variants/v3.0.6/Dockerfile
index 4156cbe..e5c9552 100644
--- a/variants/v3.0.6/Dockerfile
+++ b/variants/v3.0.6/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.0.7/Dockerfile b/variants/v3.0.7/Dockerfile
index 0c325c3..895d580 100644
--- a/variants/v3.0.7/Dockerfile
+++ b/variants/v3.0.7/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.0.8/Dockerfile b/variants/v3.0.8/Dockerfile
index b2a660c..c1f5e02 100644
--- a/variants/v3.0.8/Dockerfile
+++ b/variants/v3.0.8/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.0.9/Dockerfile b/variants/v3.0.9/Dockerfile
index a9b522d..3f5e921 100644
--- a/variants/v3.0.9/Dockerfile
+++ b/variants/v3.0.9/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.1.0/Dockerfile b/variants/v3.1.0/Dockerfile
index 125fe6b..72260bc 100644
--- a/variants/v3.1.0/Dockerfile
+++ b/variants/v3.1.0/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.1.1/Dockerfile b/variants/v3.1.1/Dockerfile
index ff1df29..898e965 100644
--- a/variants/v3.1.1/Dockerfile
+++ b/variants/v3.1.1/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.1.2/Dockerfile b/variants/v3.1.2/Dockerfile
index c756d78..b0c0b29 100644
--- a/variants/v3.1.2/Dockerfile
+++ b/variants/v3.1.2/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.1.3/Dockerfile b/variants/v3.1.3/Dockerfile
index c9a453a..eb3092e 100644
--- a/variants/v3.1.3/Dockerfile
+++ b/variants/v3.1.3/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.1.4/Dockerfile b/variants/v3.1.4/Dockerfile
index a5fc389..e17c53b 100644
--- a/variants/v3.1.4/Dockerfile
+++ b/variants/v3.1.4/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.1.5/Dockerfile b/variants/v3.1.5/Dockerfile
index b27393e..2d5ebda 100644
--- a/variants/v3.1.5/Dockerfile
+++ b/variants/v3.1.5/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data
 
diff --git a/variants/v3.1.6/Dockerfile b/variants/v3.1.6/Dockerfile
index 398bbc6..13f3b6c 100644
--- a/variants/v3.1.6/Dockerfile
+++ b/variants/v3.1.6/Dockerfile
@@ -32,8 +32,8 @@ RUN set -eux; \
     \
     rm -fv "$FILE"; \
     rm -fv "$FILE.sig"; \
-    rm -rf /root/.gnupg; \
-    apk del gnupg gpg-agent dirmngr;
+    apk del gnupg gpg-agent dirmngr; \
+    rm -rf /root/.gnupg;
 
 VOLUME /data