haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

providers/docker: notify when proxying SSH

This commit is contained in:
Mitchell Hashimoto 2014-04-15 20:02:19 -07:00
parent e714720052
commit bdade7d5a6
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/providers/docker/action/prepare_ssh.rb
View File

@ -10,6 +10,9 @@ module VagrantPlugins
# If we aren't using a host VM, then don't worry about it # If we aren't using a host VM, then don't worry about it
return @app.call(env) if !env[:machine].provider.host_vm? 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 # Get the container's SSH info
info = env[:machine].ssh_info info = env[:machine].ssh_info
info[:port] ||= 22 info[:port] ||= 22

3
templates/locales/providers_docker.yml
View File

@ -19,6 +19,9 @@ en:
Container not created. Skipping. Container not created. Skipping.
not_docker_provider: |- not_docker_provider: |-
Not backed by Docker provider. Skipping. 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: messages:
destroying: |- destroying: |-