Some images might take longer build

Make sure we can wait more than 60s
Using a dict to iterate orver tuple of static values is overkill
Merge pull request #9119 from ticosax/add-timout-for-docker-build

Some images might take longer to build