Docker: improve tags support
Merge pull request #18535 from sebest/develop

Docker: improve tags support