Merge pull request #669 from javipolo/fix_ssh_key

Fix SSH_PUBKEY expansion into build-arg
containers · Jul 11, 2024 · 6deab0f · 6deab0f
2 parents 5f5e6d0 + 2bafcd5
commit 6deab0f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/training/amd-bootc/Makefile b/training/amd-bootc/Makefile
@@ -14,7 +14,7 @@ bootc: prepare-files
 		$(FROM:%=--from=%) \
 		$(INSTRUCTLAB_IMAGE:%=--build-arg INSTRUCTLAB_IMAGE=%) \
 		$(SOURCE_DATE_EPOCH:%=--timestamp=%) \
-		$(SSH_PUBKEY:%=--build-arg SSHPUBKEY=%) \
+		$(if $(SSH_PUBKEY),--build-arg SSHPUBKEY='$(SSH_PUBKEY)') \
 		--cap-add SYS_ADMIN \
 		--file Containerfile \
 		--security-opt label=disable \

diff --git a/training/intel-bootc/Makefile b/training/intel-bootc/Makefile
@@ -14,7 +14,7 @@ bootc: prepare-files
 		$(FROM:%=--build-arg BASEIMAGE=%) \
 		$(INSTRUCTLAB_IMAGE:%=--build-arg INSTRUCTLAB_IMAGE=%) \
 		$(SOURCE_DATE_EPOCH:%=--timestamp=%) \
-		$(SSH_PUBKEY:%=--build-arg SSHPUBKEY=%) \
+		$(if $(SSH_PUBKEY),--build-arg SSHPUBKEY='$(SSH_PUBKEY)') \
 		--cap-add SYS_ADMIN \
 		--file Containerfile \
 		--security-opt label=disable \

diff --git a/training/nvidia-bootc/Makefile b/training/nvidia-bootc/Makefile
@@ -22,7 +22,7 @@ bootc: driver-toolkit check-sshkey prepare-files
 		$(KERNEL_VERSION:%=--build-arg KERNEL_VERSION=%) \
 		$(OS_VERSION_MAJOR:%=--build-arg OS_VERSION_MAJOR=%) \
 		$(SOURCE_DATE_EPOCH:%=--timestamp=%) \
-		$(SSH_PUBKEY:%=--build-arg SSHPUBKEY=%) \
+		$(if $(SSH_PUBKEY),--build-arg SSHPUBKEY='$(SSH_PUBKEY)') \
 		--cap-add SYS_ADMIN \
 		--file Containerfile \
 		--security-opt label=disable \