Merge "Support to build docker image with commit id"