Fix the docker image parser to account for private repos #24926
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
Juanadelacuesta
changed the title
Juanadelacuesta
force-pushed
the
b-gh-24913-docker
branch
from
3c77d14 to
8475880
Compare
Juanadelacuesta
force-pushed
the
b-gh-24913-docker
branch
from
8475880 to
199dfdc
Compare
tgross
reviewed
Jan 23, 2025
drivers/docker/utils.go
Outdated
| @@ -21,31 +21,41 @@ import ( | |||
| "github.com/docker/docker/registry" | |||
| ) | |||
|
|
|||
| var regexForDockerImages = `^(?:(?P<registry>[^/]+)/)?(?P<repository>[^:@]+)(?::(?P<tag>[^@]+))?(?:@(?P<digest>sha256:[a-fA-F0-9]{64}))?$` | |||
There was a problem hiding this comment.
We already have https://pkg.go.dev/github.com/distribution/reference as a dependency. Maybe we should use that official upstream instead of our own regex (as awesome as this regex is 😁 )? We can probably even ditch the test in that case.
…ocker package instead
Juanadelacuesta
force-pushed
the
b-gh-24913-docker
branch
from
c891c94 to
be91f55
Compare
tgross
reviewed
Jan 24, 2025
| tag = "latest" | ||
| matches := reference.ReferenceRegexp.FindStringSubmatch(image) | ||
| if matches == nil { | ||
| return "", "" |
There was a problem hiding this comment.
The caller doesn't expect an empty string value and is going to do some weird stuff in this case like incrementing the image reference count for empty string. (The original version of this function would return something even if it wasn't all that useful.) We should probably adjust the signature of this function to return an error and have the caller handle that properly.
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.
Description
This PR addresses this issue.
There was a little bug in the
parseDockerImagewhere we were using/the determine the tag and if none was found, it would add latest, completely ignoring the cases where there is a sha present.This PR refactors the logic to avoid adding the
latesttag if a sha is provided.The extra change corresponds to moving the tests to the
utils_test.gofor clarity.Testing & Reproduction steps
Links
Contributor Checklist
changelog entry using the
make clcommand.ensure regressions will be caught.
and job configuration, please update the Nomad website documentation to reflect this. Refer to
the website README for docs guidelines. Please also consider whether the
change requires notes within the upgrade guide.
Reviewer Checklist
backporting document.
in the majority of situations. The main exceptions are long-lived feature branches or merges where
history should be preserved.
within the public repository.