From 82e9faecc9c96756d22585eb360b16e65c519800 Mon Sep 17 00:00:00 2001
From: Menny Even Danan <menny@evendanan.net>
Date: Sun, 30 Nov 2025 12:40:57 -0500
Subject: [PATCH] Add gpg back

---
 .github/versions.env                    |  2 +-
 .github/workflows/post_merge_deploy.yml | 33 ++++++++++++++-----------
 android_base/Dockerfile                 |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/versions.env b/.github/versions.env
index d933072..b11468a 100755
--- a/.github/versions.env
+++ b/.github/versions.env
@@ -1,3 +1,3 @@
-IMAGE_VERSION=1.22.2
+IMAGE_VERSION=1.22.3
 NDK_VERSION=29.0.14206865
 BAZELISK_VERSION=v1.27.0
diff --git a/.github/workflows/post_merge_deploy.yml b/.github/workflows/post_merge_deploy.yml
index d4bb81f..8577dbd 100644
--- a/.github/workflows/post_merge_deploy.yml
+++ b/.github/workflows/post_merge_deploy.yml
@@ -153,32 +153,37 @@ jobs:
         tag_name: ${{ env.IMAGE_VERSION }}
         generate_release_notes: true
         body: |
-          **Base**: image with JDK 21, Android SDK Manager ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_base/Dockerfile)):<br/>
+          **Base**: image with JDK 21, Android SDK Manager ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_base/Dockerfile)):
+          
           ```
           docker pull ghcr.io/menny/android_base:${{ env.IMAGE_VERSION }}
-          ```<br/>
-          <br/>
-          **Android**: Base + Build Tools, Platform level 36 ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/Dockerfile)):<br/>
+          ```
+
+          **Android**: Base + Build Tools, Platform level 36 ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/Dockerfile)):
+          
           ```
           docker pull ghcr.io/menny/android:${{ env.IMAGE_VERSION }}
-          ```<br/>
-          <br/>
-          **NDK**: Android + NDK ${{ env.NDK_VERSION }} ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_ndk/Dockerfile)):<br/>
+          ```
+          
+          **NDK**: Android + NDK ${{ env.NDK_VERSION }} ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_ndk/Dockerfile)):
+          
           ```
           docker pull ghcr.io/menny/android_ndk:${{ env.IMAGE_VERSION }}
-          ```<br/>
-          <br/>
-          **Bazel**: Android + Bazelisk ${{ env.BAZELISK_VERSION }} and Go ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_bazel/Dockerfile)):<br/>
+          ```
+          
+          **Bazel**: Android + Bazelisk ${{ env.BAZELISK_VERSION }} and Go ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_bazel/Dockerfile)):
+          
           ```
           docker pull ghcr.io/menny/android_bazel:${{ env.IMAGE_VERSION }}
           ```
-          <br/>
-          **Dev-Base**: Bazel + node, pnpm, zsh, Claude-Code, and gemini-cli ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_dev_base/Dockerfile)):<br/>
+          
+          **Dev-Base**: Bazel + node, pnpm, zsh, Claude-Code, and gemini-cli ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_dev_base/Dockerfile)):
           ```
           docker pull ghcr.io/menny/android_dev_base:${{ env.IMAGE_VERSION }}
           ```
-          <br/>
-          **Dev**: android_dev_base + oh-my-zsh + sshd + some scripts ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_dev/Dockerfile)):<br/>
+
+          **Dev**: android_dev_base + oh-my-zsh + sshd + some scripts ([Dockerfile](https://github.com/menny/docker_android/blob/${{ env.IMAGE_VERSION }}/android_dev/Dockerfile)):
+          
           ```
           docker pull ghcr.io/menny/android_dev:${{ env.IMAGE_VERSION }}
           ```
diff --git a/android_base/Dockerfile b/android_base/Dockerfile
index 548219a..bcae338 100644
--- a/android_base/Dockerfile
+++ b/android_base/Dockerfile
@@ -13,7 +13,7 @@ ENV TERM=dumb
 RUN apt-get update \
     && apt-get install -y --allow-remove-essential --allow-change-held-packages --no-install-recommends \
       locales ca-certificates build-essential zlib1g-dev \
-      pkg-config file \
+      pkg-config file gpg \
       python3 python3-pip python3-lxml python3-yaml libxml2-utils yamllint \
       wget curl nano rsync zip psmisc rsyslog jq unzip \
       imagemagick librsvg2-bin \