Merge "Fix docker image bug"