[24.0 backport] assorted dockerfile and test updates#4587

neersighted merged 5 commits intodocker:24.0docker/cli:24.0from

thaJeztah:24.0_backport_go1.21_preparethaJeztah/cli:24.0_backport_go1.21_prepareCopy head branch name to clipboard