Merge "adjust docker image for ip override"