From 52a58df1daf6185fc8e542e9a9f96335714fa450 Mon Sep 17 00:00:00 2001
From: Phuong Nguyen <phuong.fi.91@gmail.com>
Date: Mon, 11 May 2026 09:44:13 +0700
Subject: [PATCH 1/2] feat: add gpg to container

---
 Dockerfile       | 2 ++
 tests/specs.yaml | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index e692650..3e4ad88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,6 +95,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     openssh-client \
     jq \
     zsh \
+    gpg \
+    gpg-agent \
     # Database clients:
     postgresql-client \
     libmariadb-dev \
diff --git a/tests/specs.yaml b/tests/specs.yaml
index ec184ec..2faf346 100644
--- a/tests/specs.yaml
+++ b/tests/specs.yaml
@@ -19,6 +19,11 @@ commandTests:
     args: ["-V"]
     expectedError: ["OpenSSH"]
 
+  - name: "gpg is installed in path"
+    command: "gpg"
+    args: ["--version"]
+    expectedOutput: ["gpg (GnuPG)"]
+
   - name: "uv is installed in path"
     command: "uv"
     args: ["--version"]

From 5cd67c7d3beea22f51a0d4e98cd30053d2571201 Mon Sep 17 00:00:00 2001
From: Phuong Nguyen <phuong.fi.91@gmail.com>
Date: Mon, 11 May 2026 10:01:04 +0700
Subject: [PATCH 2/2] fix: Test and tweak pkg install

---
 Dockerfile       | 3 +--
 tests/specs.yaml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3e4ad88..c691aae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -95,8 +95,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     openssh-client \
     jq \
     zsh \
-    gpg \
-    gpg-agent \
+    gnupg \
     # Database clients:
     postgresql-client \
     libmariadb-dev \
diff --git a/tests/specs.yaml b/tests/specs.yaml
index 2faf346..710ded1 100644
--- a/tests/specs.yaml
+++ b/tests/specs.yaml
@@ -22,7 +22,7 @@ commandTests:
   - name: "gpg is installed in path"
     command: "gpg"
     args: ["--version"]
-    expectedOutput: ["gpg (GnuPG)"]
+    expectedOutput: ["gpg"]
 
   - name: "uv is installed in path"
     command: "uv"