Merge "Fix docker-entrypoint.sh"