This repository was archived by the owner on May 30, 2023. It is now read-only.
app-admin/*-wrapper: Only set arguments that weren't set#426
Merged
pothos merged 1 commit intoflatcar-masterfrom Jun 17, 2020
Merged
app-admin/*-wrapper: Only set arguments that weren't set#426pothos merged 1 commit intoflatcar-masterfrom
pothos merged 1 commit intoflatcar-masterfrom
Conversation
When 788f328 introduced pulling from docker by default, "--insecure-options=image" was added for all docker registries. However, when the user also needs to set "http" as in "--insecure-options=image,http" it will not be used because the other argument is added as last disregarding the option was already set by the user. Check if the option was set by the user and only add it if it is not provided. If the user forgets to add "image" then rkt will simply fail and tell that this option is needed; thus no complex logic of appending and detecting only "image" is needed. Do the same for the "--trust-keys-from-https" option to be consistent in allowing to overwrite it with "--trust-keys-from-https=false".
24e775a to
2a38092
Compare
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
When 788f328 introduced pulling from
docker by default, "--insecure-options=image" was added for all
docker registries. However, when the user also needs to set "http" as
in "--insecure-options=image,http" it will not be used because the
other argument is added as last disregarding the option was already
set by the user.
Check if the option was set by the user and only add it if it is not
provided. If the user forgets to add "image" then rkt will simply
fail and tell that this option is needed; thus no complex logic of
appending and detecting only "image" is needed. Do the same for the
"--trust-keys-from-https" option to be consistent in allowing to
overwrite it with "--trust-keys-from-https=false".
How to use/test
Note: Pick for all channels