From 3cb460b72ed3fb03ac98c737852e19a154e58a7c Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Sun, 4 Aug 2024 13:29:39 -0700
Subject: [PATCH] GIT_KEY GIT_PUBKEY

---
 Containerfile      | 4 ++--
 Makefile           | 6 +++---
 rootfs/etc/profile | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Containerfile b/Containerfile
index ac3d19a..96c502d 100644
--- a/Containerfile
+++ b/Containerfile
@@ -39,7 +39,7 @@ ARG VERSION development
 ARG GIT_TIMESTAMP null
 ARG GIT_AUTHOR null
 ARG GIT_REF null
-ARG GIT_KEY null
+ARG GIT_PUBKEY null
 COPY --from=busybox . /
 COPY --from=musl . /
 COPY --from=xorriso . /
@@ -88,7 +88,7 @@ COPY <<-EOF initramfs/etc/environment
     export GIT_TIMESTAMP="$GIT_TIMESTAMP"
     export GIT_AUTHOR="$GIT_AUTHOR"
     export GIT_REF="$GIT_REF"
-    export GIT_KEY="$GIT_KEY"
+    export GIT_PUBKEY="$GIT_PUBKEY"
 EOF
 RUN <<-EOF
     set -eux
diff --git a/Makefile b/Makefile
index 64fe464..4c573cd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION := development
 GIT_REF := $(shell git log -1 --format=%H)
 GIT_AUTHOR := $(shell git log -1 --format=%an)
-GIT_KEY := $(shell git log -1 --format=%GP)
+GIT_PUBKEY := $(shell git log -1 --format=%GP)
 GIT_TIMESTAMP := $(shell git log -1 --format=%cd --date=iso)
 export
 
@@ -32,7 +32,7 @@ out/airgap.iso: Containerfile $(shell git ls-files rootfs)
 		--build-arg VERSION="$(VERSION)" \
 		--build-arg GIT_REF="$(GIT_REF)" \
 		--build-arg GIT_AUTHOR="$(GIT_AUTHOR)" \
-		--build-arg GIT_KEY="$(GIT_KEY)" \
+		--build-arg GIT_PUBKEY="$(GIT_PUBKEY)" \
 		--build-arg GIT_TIMESTAMP="$(GIT_TIMESTAMP)" \
 		$(NO_CACHE) \
 		-f Containerfile \
@@ -120,7 +120,7 @@ out/release.env: $(shell git ls-files) | out
 	echo 'VERSION=$(VERSION)'              > out/release.env
 	echo 'GIT_REF=$(GIT_REF)'             >> out/release.env
 	echo 'GIT_AUTHOR=$(GIT_AUTHOR)'       >> out/release.env
-	echo 'GIT_KEY=$(GIT_KEY)'             >> out/release.env
+	echo 'GIT_PUBKEY=$(GIT_PUBKEY)'             >> out/release.env
 	echo 'GIT_TIMESTAMP=$(GIT_TIMESTAMP)' >> out/release.env
 
 out/manifest.txt: out/airgap.iso out/release.env | out
diff --git a/rootfs/etc/profile b/rootfs/etc/profile
index 4c74793..ffff30e 100644
--- a/rootfs/etc/profile
+++ b/rootfs/etc/profile
@@ -18,5 +18,5 @@ echo "  - Version: $VERSION"
 echo "  - Date: $GIT_TIMESTAMP"
 echo "  - Committer: $GIT_AUTHOR"
 echo "  - Commit: $GIT_REF"
-echo "  - Key: $GIT_KEY"
+echo "  - Key: $GIT_PUBKEY"
 echo ""