Merge "Fix to push docker image fail issue"