Merge "Change the command line from CMD to ENTRYPOINT"