Merge pull request #4170 from dnephin/warn-on-deploy

Update messages about docker stack deploy

compose/config/config.py

@@ -334,8 +334,8 @@ def load(config_details):
     if services_using_deploy:
         log.warn(
             "Some services ({}) use the 'deploy' key, which will be ignored. "
-            "Compose does not support deploy configuration - use the experimental "
-            "`docker deploy` command to deploy to a swarm."
+            "Compose does not support deploy configuration - use "
+            "`docker stack deploy` to deploy to a swarm."
             .format(", ".join(sorted(s['name'] for s in services_using_deploy))))
 
     return Config(main_file.version, service_dicts, volumes, networks)

compose/project.py

@@ -559,9 +559,7 @@ def warn_for_swarm_mode(client):
             "Compose does not use swarm mode to deploy services to multiple nodes in a swarm. "
             "All containers will be scheduled on the current node.\n\n"
             "To deploy your application across the swarm, "
-            "use the bundle feature of the Docker experimental build.\n\n"
-            "More info:\n"
-            "https://docs.docker.com/compose/bundles\n"
+            "use `docker stack deploy`.\n"
         )