Merge pull request #17389 from tonistiigi/15995-duplicate-names

Fix duplicate container names conflict