Skip to content

WX-1445 Update docker image regex to handle python:3 correctly #7367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 20, 2024
Merged

WX-1445 Update docker image regex to handle python:3 correctly #7367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ea3430
Update docker image regex to handle python:3 correctly
jgainerdewar Feb 20, 2024
238ff74
Allow port 443
jgainerdewar Feb 20, 2024
b701773
Merge branch 'develop' into jgd_WX-1445_python3
jgainerdewar Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockerHashing/src/main/scala/cromwell/docker/DockerImageIdentifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ object DockerImageIdentifier {

( # Begin capturing group for name
[a-z0-9]+(?:[._-][a-z0-9]+)* # API v2 name component regex - see https://docs.docker.com/registry/spec/api/#/overview
(?::[0-9]+)? # Optional port
(?::[0-9]{4,5}|:443)? # Optional port (expect 4 or 5 digits OR :443)
(?:/[a-z0-9]+(?:[._-][a-z0-9]+)*)* # Optional additional name components separated by /
) # End capturing group for name

Expand Down
2 changes: 2 additions & 0 deletions dockerHashing/src/test/scala/cromwell/docker/DockerImageIdentifierSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ class DockerImageIdentifierSpec
"0.8.1.1--htslib1.5_0"
),
("terrabatchdev.azurecr.io/postgres:latest", Option("terrabatchdev.azurecr.io"), None, "postgres", "latest"),
("python:3", None, None, "python", "3"),
("localhost:443/ubuntu", Option("localhost:443"), None, "ubuntu", "latest"),
// Very long tags with trailing spaces cause problems for the re engine
("someuser/someimage:supercalifragilisticexpialidociouseventhoughthesoundofitissomethingquiteatrociousifyousayitloudenoughyoullalwayssoundprecocious ",
None,
Expand Down