From bdade7d5a6942c28410dfe816916ce756e7bcf7a Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 15 Apr 2014 20:02:19 -0700 Subject: [PATCH] providers/docker: notify when proxying SSH --- plugins/providers/docker/action/prepare_ssh.rb | 3 +++ templates/locales/providers_docker.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/plugins/providers/docker/action/prepare_ssh.rb b/plugins/providers/docker/action/prepare_ssh.rb index 692f46883..c69c3c043 100644 --- a/plugins/providers/docker/action/prepare_ssh.rb +++ b/plugins/providers/docker/action/prepare_ssh.rb @@ -10,6 +10,9 @@ module VagrantPlugins # If we aren't using a host VM, then don't worry about it return @app.call(env) if !env[:machine].provider.host_vm? + env[:machine].ui.output(I18n.t( + "docker_provider.ssh_through_host_vm")) + # Get the container's SSH info info = env[:machine].ssh_info info[:port] ||= 22 diff --git a/templates/locales/providers_docker.yml b/templates/locales/providers_docker.yml index b902255f1..e20a460f4 100644 --- a/templates/locales/providers_docker.yml +++ b/templates/locales/providers_docker.yml @@ -19,6 +19,9 @@ en: Container not created. Skipping. not_docker_provider: |- Not backed by Docker provider. Skipping. + ssh_through_host_vm: |- + SSH will be proxied through the Docker virtual machine since we're + not running Docker natively. This is just a notice, and not an error. messages: destroying: |-