Allow to use registry as host and port only to allow to use podman as executable #94
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
jglick
changed the title
|
Is there anything to support to bring this PR forward? We currently face this issue as the infrastructure provided uses now podman for agents. |
mmusenbr
reviewed
Aug 3, 2022
| @@ -111,6 +113,14 @@ public KeyMaterial materialize() throws IOException, InterruptedException { | |||
| } | |||
| return new RegistryKeyMaterial(dockerConfig, new EnvVars("DOCKER_CONFIG", dockerConfig.getRemote())); | |||
| } | |||
|
|
|||
| protected String registry() { | |||
| if (dockerExecutable.endsWith("podman") || Boolean.parseBoolean(env.get(DOCKER_REGISTRY_HOST_ONLY, "false"))) { | |||
There was a problem hiding this comment.
is this podman check ideal? Better than not having it maybe, but it will not detect if the podman-docker wrapper is used.
There was a problem hiding this comment.
I don't know anything about podman, so I am not any help here :)
But I guess if anyone comes up with something better it can be enhanced in the future.
|
From what I read, this only applies for podman >= 3.3 and <= 4.0. This is fixed in 4.1 in podman. |
rsandell
approved these changes
Aug 23, 2022
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.
This is a fix for docker workflow plugin issue that manifests when using
podman. The fix here allows to either directly (based on tool name) or via environment variable to use just how and port of the registry url instead of complete one.https://issues.jenkins.io/browse/JENKINS-67418