tools/docker: backport some fixes from main/4.23 - #13814

tools/docker: backport some fixes from main/4.23 #13814

weizhouapache wants to merge 5 commits into

4.22apache/cloudstack:4.22from

4.22.1.0-backport-docker-fixapache/cloudstack:4.22.1.0-backport-docker-fixCopy head branch name to clipboard