Backport of docker: Fix a bug where images with port number and no tags weren't parsed correctly into release/1.9.x

Backport of docker: Fix a bug where images with port number and no tags weren't parsed correctly into release/1.9.x #17048