Skip to content

Commit 42f4c9a

Browse files
committed
Recover --docker-base-image feature
In the bioconda#866 we introduced the `--docker-base-image` to help user to specify customized build docker image (such as Linux aarch64 build). But we noticed that it doesn’t work after the bioconda#894 , because a local var introduced and the `docker-base-image` arguments is ignored: https://github.com/bioconda/bioconda-utils/blame/9a85115ae306f58c8b4e65e5f92f6cbdb5b68f04/bioconda_utils/cli.py#L468 This PR try to recover it, if user specify the `--docker-base-image`, it will be used directly otherwise use the local var. Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
1 parent 9a85115 commit 42f4c9a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

bioconda_utils/cli.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ def build(recipe_folder, config, packages="*", git_range=None, testonly=False,
465465
logger.warning(f"Using tag {image_tag} for docker image, since there is no image for a not yet release version ({VERSION}).")
466466
else:
467467
image_tag = VERSION
468-
docker_base_image = f"quay.io/bioconda/bioconda-utils-build-env-cos7:{image_tag}"
468+
docker_base_image = docker_base_image or f"quay.io/bioconda/bioconda-utils-build-env-cos7:{image_tag}"
469469
logger.info(f"Using docker image {docker_base_image} for building.")
470470

471471
docker_builder = docker_utils.RecipeBuilder(

0 commit comments

Comments
 (0)