From c8d86b9b3d64f8f6cc18454657c7911056362174 Mon Sep 17 00:00:00 2001 From: yoogottamk Date: Sun, 13 Feb 2022 12:50:08 +0530 Subject: [PATCH] Pass build_args to `render()` during `--no-build` for consistency with regular builds --- repo2docker/app.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/repo2docker/app.py b/repo2docker/app.py index 8c896828..92e483e2 100755 --- a/repo2docker/app.py +++ b/repo2docker/app.py @@ -773,25 +773,26 @@ class Repo2Docker(Application): 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: - print(picked_buildpack.render()) + print(picked_buildpack.render(build_args)) else: self.log.debug( - picked_buildpack.render(), extra=dict(phase="building") + picked_buildpack.render(build_args), + extra=dict(phase="building"), ) if self.user_id == 0: raise ValueError( "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( "Using %s builder\n", bp.__class__.__name__,