Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SSH_PUBKEY expansion into build-arg #669

Merged
merged 1 commit into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion training/amd-bootc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion training/intel-bootc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion training/nvidia-bootc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down