Merge "Update Dockerfile and docker_*.sh"