Fix cross-compile docker image building (#4006)

Fix cross-compile docker image building (#4006) #1327