Fix embedding of SRK_HASH (#179)

Dockerfile

@@ -7,6 +7,7 @@ ARG APPLET_PUBLIC_KEY
 ARG OS_PUBLIC_KEY1
 ARG OS_PUBLIC_KEY2
 ARG GIT_SEMVER_TAG
+ARG SRK_HASH
 # Build environment variables. In addition to routing these through to the make
 # command, they MUST also be committed to in the manifest.
 ARG BEE
@@ -38,6 +39,7 @@ ENV LOG_ORIGIN=${LOG_ORIGIN} \
     OS_PUBLIC_KEY2="/tmp/os2.pub" \
     GIT_SEMVER_TAG=${GIT_SEMVER_TAG} \
     BEE=${BEE} \
-    DEBUG=${DEBUG}
+    DEBUG=${DEBUG} \
+    SRK_HASH=${SRK_HASH}
 
 RUN make trusted_os_release

Makefile

@@ -16,7 +16,7 @@ BUILD_EPOCH := $(shell /bin/date -u "+%s")
 BUILD_TAGS = linkramsize,linkramstart,disable_fr_auth,linkprintk
 REV = $(shell git rev-parse --short HEAD 2> /dev/null)
 GIT_SEMVER_TAG ?= $(shell (git describe --tags --exact-match --match 'v*.*.*' 2>/dev/null || git describe --match 'v*.*.*' --tags 2>/dev/null || git describe --tags 2>/dev/null || echo -n v0.0.${BUILD_EPOCH}+`git rev-parse HEAD`) | tail -c +2 )
-SRK_HASH ?= ""
+SRK_HASH ?= 
 
 PROTOC ?= /usr/bin/protoc
 

release/cloudbuild_ci.yaml

@@ -26,7 +26,7 @@ steps:
           --build-arg=OS_PUBLIC_KEY2=${_OS_PUBLIC_KEY2} \
           --build-arg=BEE=${_BEE} \
           --build-arg=DEBUG=${_DEBUG} \
-          --build-arg="SRK_HASH=${_CI_SRK_HASH}" \
+          --build-arg=SRK_HASH=${_CI_SRK_HASH} \
           -t builder-image \
           .
   # Prepare a container with a copy of the artifacts.