force --no-cache in reproduce mode

.gitignore

@@ -1,4 +1,3 @@
 cache/
 out/
-out*/
 .*

Containerfile

@@ -22,6 +22,7 @@ FROM stagex/libgcrypt:sx2024.08.0@sha256:ea1906215d18688d96fc5329301af649834fe96
 FROM stagex/jq:sx2024.08.0@sha256:0297a099ae95eed13d48bce2d4d624544857680095b6201e9919e1d5da45a6cd AS jq
 FROM stagex/yq:sx2024.08.0@sha256:10e80bd7cec3c6e0a7fd36c65bac13600368bff993ad42b03e3b787d2125e5f0 AS yq
 FROM stagex/bc:sx2024.08.0@sha256:1ecf6029ceed91dd62b08c64e49f00518edcf6c10ac4ab2fe7e8f71943607eef AS bc
+FROM stagex/git:sx2024.08.0@sha256:d177bde1f1ca0f20f74502af4da17b89628683f21116573ada69f38b46d367a6 AS git
 FROM stagex/zlib:sx2024.08.0@sha256:d0d6eef463a410191e086448c710441109ae72693cb074fe2b795ee033aa6c9d AS zlib
 FROM stagex/tpm2-tools:sx2024.08.0@sha256:1693d4ef7e0b7df3e9bd60088588d94b7f5bf755fde0c1be695f3c2f00ec2897 AS tpm2-tools
 FROM stagex/tpm2-tss:sx2024.08.0@sha256:5e362f43a5e0c49f774605a0e3e1b7523dc6bc775f537c206a3aaa8b8b733c93 AS tpm2-tss
@@ -39,7 +40,7 @@ ARG VERSION development
 ARG GIT_TIMESTAMP null
 ARG GIT_AUTHOR null
 ARG GIT_REF null
-ARG GIT_PUBKEY null
+ARG GIT_KEY null
 COPY --from=busybox . /
 COPY --from=musl . /
 COPY --from=xorriso . /
@@ -69,6 +70,7 @@ COPY --from=gpg . initramfs
 COPY --from=jq . initramfs
 COPY --from=yq . initramfs
 COPY --from=bc . initramfs
+COPY --from=git . initramfs
 COPY --from=flashtools . initramfs
 COPY --from=tpm2-tools . initramfs
 COPY --from=tpm2-tss . initramfs
@@ -88,22 +90,13 @@ COPY <<-EOF initramfs/etc/environment
     export GIT_TIMESTAMP="$GIT_TIMESTAMP"
     export GIT_AUTHOR="$GIT_AUTHOR"
     export GIT_REF="$GIT_REF"
-    export GIT_PUBKEY="$GIT_PUBKEY"
+    export GIT_KEY="$GIT_KEY"
 EOF
 RUN <<-EOF
-    set -eux
+	cd initramfs
-    cd initramfs
+	find . -print0 \
-    find . -exec touch -hcd "@0" "{}" +
+	| cpio --null --create --verbose --format=newc \
-    find . -print0 \
+	| gzip --best > ../iso/boot/initramfs
-    | sort -z \
-    | cpio \
-        --null \
-        --create \
-        --verbose \
-        --reproducible \
-        --format=newc \
-    | gzip --best \
-    > ../iso/boot/initramfs
 EOF
 
 ## Grub (EFI Boot)
@@ -133,9 +126,8 @@ RUN <<-EOF
         gzio \
         serial \
         terminal
-    find efi -exec touch -hcd "@0" "{}" +
     mformat -i iso/boot/grub/efi.img -C -f 1440 -N 0 ::
-    mcopy -i iso/boot/grub/efi.img -ms efi ::
+    mcopy -i iso/boot/grub/efi.img -s efi ::
     touch -md "@0" iso/boot/grub/efi.img
 EOF
 
@@ -152,32 +144,25 @@ COPY --from=syslinux \
 
 ## Build Hybrid EFI/BIOS ISO
 FROM build AS install
-ENV SOURCE_DATE_EPOCH=1
+RUN xorrisofs \
-# --set_all_file_dates='1'
+    -output airgap.iso \
-# --modification-date='1970010100000000' \
+    -full-iso9660-filenames \
-RUN <<-EOF
+    -joliet \
-    set -eux
+    -rational-rock \
-    find iso -exec touch -hcd "@0" "{}" +
+    -sysid LINUX \
-    xorrisofs \
+    -volid "airgap" \
-        -output airgap.iso \
+    -isohybrid-mbr iso/boot/syslinux/isohdpfx.bin \
-        -full-iso9660-filenames \
+    -eltorito-boot boot/syslinux/isolinux.bin \
-        -joliet \
+    -eltorito-catalog boot/syslinux/boot.cat \
-        -rational-rock \
+    -no-emul-boot \
-        -sysid LINUX \
+    -boot-load-size 4 \
-        -volid "airgap" \
+    -boot-info-table \
-        -isohybrid-mbr iso/boot/syslinux/isohdpfx.bin \
+    -eltorito-alt-boot \
-        -eltorito-boot boot/syslinux/isolinux.bin \
+    -e boot/grub/efi.img \
-        -eltorito-catalog boot/syslinux/boot.cat \
+    -no-emul-boot \
-        -no-emul-boot \
+    -isohybrid-gpt-basdat \
-        -boot-load-size 4 \
+    -follow-links \
-        -boot-info-table \
+   iso/
-        -eltorito-alt-boot \
-        -e boot/grub/efi.img \
-        -no-emul-boot \
-        -isohybrid-gpt-basdat \
-        -follow-links \
-        iso/
-EOF
 
 ## Minimal Autorun SD card image
 COPY sdcard sdcard
@@ -189,5 +174,7 @@ RUN <<-EOF
 EOF
 
 FROM scratch AS package
+COPY --from=install /iso /iso
+COPY --from=install /initramfs /initramfs
 COPY --from=install /sdcard.img /
 COPY --from=install /airgap.iso /

Makefile

@@ -1,17 +1,16 @@
-VERSION := development
+VERSION := $(shell git tag --points-at HEAD)
 GIT_REF := $(shell git log -1 --format=%H)
 GIT_AUTHOR := $(shell git log -1 --format=%an)
-GIT_PUBKEY := $(shell git log -1 --format=%GP)
+GIT_KEY := $(shell git log -1 --format=%GP)
 GIT_TIMESTAMP := $(shell git log -1 --format=%cd --date=iso)
+VERSION := development
 export
 
 ## Use env vars from latest release when reproducing
 ifdef REPRODUCE
 include dist/release.env
-export
-endif
-ifdef NOCACHE
 NO_CACHE := --no-cache
+export
 endif
 
 .DEFAULT_GOAL :=
@@ -24,15 +23,13 @@ default: \
 ## Primary targets
 
 out/airgap.iso: Containerfile $(shell git ls-files rootfs)
-	SOURCE_DATE_EPOCH=1 \
 	docker build \
 		--progress=plain \
-		--output type=local,rewrite-timestamp=true,dest=out \
+		--output type=local,dest=out \
-		--build-arg SOURCE_DATE_EPOCH=1 \
 		--build-arg VERSION="$(VERSION)" \
 		--build-arg GIT_REF="$(GIT_REF)" \
 		--build-arg GIT_AUTHOR="$(GIT_AUTHOR)" \
-		--build-arg GIT_PUBKEY="$(GIT_PUBKEY)" \
+		--build-arg GIT_KEY="$(GIT_KEY)" \
 		--build-arg GIT_TIMESTAMP="$(GIT_TIMESTAMP)" \
 		$(NO_CACHE) \
 		-f Containerfile \
@@ -79,9 +76,8 @@ clean:
 	rm -rf out
 
 .PHONY: release
-release: clean
+release: default
 	rm -rf dist/*
-	$(MAKE) NOCACHE=1 VERSION=$(VERSION)
 	cp -R out/release.env out/airgap.iso out/manifest.txt dist/
 
 .PHONY: sign
@@ -110,7 +106,7 @@ verify: | dist/manifest.txt
 
 .PHONY: reproduce
 reproduce: clean | out
-	$(MAKE) REPRODUCE=true NOCACHE=1
+	$(MAKE) REPRODUCE=true
 	diff -q out/manifest.txt dist/manifest.txt;
 
 out:
@@ -120,7 +116,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_PUBKEY=$(GIT_PUBKEY)'             >> out/release.env
+	echo 'GIT_KEY=$(GIT_KEY)'             >> out/release.env
 	echo 'GIT_TIMESTAMP=$(GIT_TIMESTAMP)' >> out/release.env
 
 out/manifest.txt: out/airgap.iso out/release.env | out

dist/manifest.txt

@@ -1,2 +1,2 @@
-a78a023a9532927f0e7af7ce1177b8286fdfa425670d166932f46ee90abcafe8 airgap.iso
+18df33fc5e787057004f0783cbd40f9a808c67943d7a53b7c20cd7b92f6bf2bf airgap.iso
-bc742e2b08089bb2e685a71a45e1ab28d7bf6151bf06417e1bc729eb60353e0d release.env
+ec5912ec6bafc7c9a61e3ecee440485c249a57dca1aa1cc2ac15dc13e682875b release.env

dist/release.env

@@ -1,5 +1,5 @@
 VERSION=2024.8.0
-GIT_REF=3cb460b72ed3fb03ac98c737852e19a154e58a7c
+GIT_REF=74bf27bc6601d4f3f0d22c0f854594b854e893d0
 GIT_AUTHOR=Lance R. Vick
-GIT_PUBKEY=6B61ECD76088748C70590D55E90A401336C8AAA9
+GIT_KEY=6B61ECD76088748C70590D55E90A401336C8AAA9
-GIT_TIMESTAMP=2024-08-04 13:29:39 -0700
+GIT_TIMESTAMP=2024-08-02 22:15:34 -0700

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_PUBKEY"
+echo "  - Key: $GIT_KEY"
 echo ""