Commit e1ed5ace authored by David Johnson's avatar David Johnson

Minor Docker image bugfix: do not prepend library/ if path separators present.

This prepend-library/ hack exists to comply with the Docker Hub's naming
scheme, and how users are allowed to shorten paths.  But we don't want
to use it if there are already path separators in the path; this may
indicate the use of a user repo.
parent 1d3f6787
......@@ -2359,9 +2359,12 @@ sub GetTicketAuxAux($)
# If we end up pulling from the docker hub, we need to
# prefix the repo with 'library/', because that is how
# they do things!
# However, do exclude any image with a path separator;
# this may be a user or private repo.
if (($d_extserver eq 'registry-1.docker.io'
|| $d_extserver eq 'registry.hub.docker.com')
&& $repo !~ /^library\//) {
&& $repo !~ /^library\//
&& $repo !~ /\//) {
$repo = 'library/' . $repo;
}
push(@cmd,'-r');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment