fix: recover --docker-base-image feature #906
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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>
Yikun
changed the title
Yikun
changed the title
|
All CI passed, ready for review |
johanneskoester
approved these changes
Aug 9, 2023
|
@johanneskoester Thanks! |
johanneskoester
pushed a commit
that referenced
this pull request
Aug 24, 2023
🤖 I have created a release \*beep\* \*boop\* --- ## [2.4.0](https://www.github.com/bioconda/bioconda-utils/compare/v2.3.4...v2.4.0) (2023-08-24) ### Features * lint missing run exports ([#908](https://www.github.com/bioconda/bioconda-utils/issues/908)) ([84f5c0c](https://www.github.com/bioconda/bioconda-utils/commit/84f5c0c0b4ec4ba4f1756cbe74da50151efa77a3)) ### Bug Fixes * recover --docker-base-image feature ([#906](https://www.github.com/bioconda/bioconda-utils/issues/906)) ([aa08857](https://www.github.com/bioconda/bioconda-utils/commit/aa088572d3721837d08556634961c5c7d86814c1)) * swaps from github API to expanding the assets ([#907](https://www.github.com/bioconda/bioconda-utils/issues/907)) ([2099a40](https://www.github.com/bioconda/bioconda-utils/commit/2099a405f1b888699eb2026146aa0b4f3f070fb0)) * use package name instead of folder for build failure list dag check ([#910](https://www.github.com/bioconda/bioconda-utils/issues/910)) ([11fb14f](https://www.github.com/bioconda/bioconda-utils/commit/11fb14fd1a95c05dca96887d0d9935f6954447e2)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In the #866 we introduced the
--docker-base-imageto help user to specify customized build docker image (such as Linux aarch64 build).But we noticed that it doesn’t work after the #894 , because a local var introduced and the
docker-base-imagearguments is ignored.This PR try to recover it, if user specify the
--docker-base-image, it will be used directly otherwise use the local var.Test: