Merge "Fix docker ENTRYPOINT script"