gitlab-runner: make check for docker-image option with machine too #108762
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
The "docker+machine" executor requires setting docker-image too. If not, it will fail with: PANIC: The docker-image needs to be entered Since the docker-image argument was tied with the docker executor, this would fail everytime when attempting to use docker+machine.
Merged
10 tasks
misuzu
reviewed
Jan 8, 2021
| assertMsg (service.dockerImage != null) | ||
| "dockerImage option is required for docker+machine executor (${name})"); | ||
| [ "--docker-image ${service.dockerImage}" ] | ||
| ) |
There was a problem hiding this comment.
Are other --docker- options not used with docker+machine? What about docker-ssh+machine?
There was a problem hiding this comment.
Hmm, that is a good point. I actually do not know, since I am not (currently) using them.
I was surprised by the runtime error (PANIC: …), so I wanted to add the assert for docker+machine at least.
There was a problem hiding this comment.
How is gitlab-runner register reacting to extraneous args? Maybe the --docker-* options do not need to be under the check?
There was a problem hiding this comment.
Tested #108763 docker+machine and docker-ssh+machine (--ssh-* flags required) with dockerVolumes set - no errors.
|
Closing in favor of #108763 (review) |
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.
closes: #108759
Motivation for this change
The "docker+machine" executor requires setting docker-image too. If not,
it will fail with:
PANIC: The docker-image needs to be entered
Since the docker-image argument was tied with the docker executor, this
would fail every time when attempting to use docker+machine.
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)