Merge pull request #3718 from aanand/fix-run-entrypoint

Fix bugs with entrypoint/command in docker-compose run

compose/cli/main.py

@@ -670,8 +670,10 @@ class TopLevelCommand(object):
                 'can not be used together'
             )
 
-        if options['COMMAND']:
+        if options['COMMAND'] is not None:
             command = [options['COMMAND']] + options['ARGS']
+        elif options['--entrypoint'] is not None:
+            command = []
         else:
             command = service.options.get('command')