Merge pull request #1135 from yoogottamk/dry-run-build-args

[MRG] Pass build_args to `render()` during `--no-build` for consistency with regular builds
pull/1139/head
Simon Li 2022-02-14 20:52:59 +00:00 zatwierdzone przez GitHub
commit d8c1978134
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 11 dodań i 10 usunięć

Wyświetl plik

@ -773,25 +773,26 @@ class Repo2Docker(Application):
picked_buildpack.labels.update(self.labels) picked_buildpack.labels.update(self.labels)
build_args = {
"NB_USER": self.user_name,
"NB_UID": str(self.user_id),
}
if self.target_repo_dir:
build_args["REPO_DIR"] = self.target_repo_dir
build_args.update(self.extra_build_args)
if self.dry_run: if self.dry_run:
print(picked_buildpack.render()) print(picked_buildpack.render(build_args))
else: else:
self.log.debug( self.log.debug(
picked_buildpack.render(), extra=dict(phase="building") picked_buildpack.render(build_args),
extra=dict(phase="building"),
) )
if self.user_id == 0: if self.user_id == 0:
raise ValueError( raise ValueError(
"Root as the primary user in the image is not permitted." "Root as the primary user in the image is not permitted."
) )
build_args = {
"NB_USER": self.user_name,
"NB_UID": str(self.user_id),
}
if self.target_repo_dir:
build_args["REPO_DIR"] = self.target_repo_dir
build_args.update(self.extra_build_args)
self.log.info( self.log.info(
"Using %s builder\n", "Using %s builder\n",
bp.__class__.__name__, bp.__class__.__name__,