Merge "docker: build: Fix docker connectivity loss"