vagrant-docker-exec 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 155ffbcbbfec33a327d2b9b6ca2f4b699008bd26
-  data.tar.gz: 68ae686a177b542528685d50572fa52f959491e3
+  metadata.gz: 8957378f186f209b14ab5fac4d3eafc58124c362
+  data.tar.gz: 551437aec60c3fb4afdf7cc1da07559b3f1a107e
 SHA512:
-  metadata.gz: aa3666d20522139c77a10f67828f35aeb2fbb1456f0ea04124de1bc0bc3aba1107f98aca67c06c0b9f96fabe23b799b5a3998732821e33c92949d8488da6289c
-  data.tar.gz: 9ff983923ceab8c2faca130b20f3412911267fe91e950bdda4280fec68c3d215282f879e1e1059515d0226a34aecebb2aa869ede989281c64680d5ac66468fa1
+  metadata.gz: 1af27c6e07338d16825977cc879877d9a3933257d68106b56cd1b5ae899a7fe26c96fdeaf77db8b815463fa7df7673f617e208a07234a9b1c7272a512e89b364
+  data.tar.gz: 455c2ce6255fed03dcad309e6c0edd05d024927a6919ed125ec04fe83fc50dcefa87adfbf8b0b4e076474cf99a24d8b319584265284d063d42fe1bd2bd3c2bf1

data/.gitignore

@@ -1,6 +1,5 @@
 .vagrant
 Gemfile.lock
-Vagrantfile
-Vagrantfile.proxy
+Vagrantfile*
 www
 pkg

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3 (March 7, 2015)
+
+* Exec commands now use machine id and no longer expects a container name
+
 ## 0.1.2 (March 5, 2015)
 
 * Exec commands terminal output is now diplayed

data/README.md

@@ -7,14 +7,12 @@ Docker exec requires Docker 1.3.0 or higher. On non-Linux system, the docker in
 You can find more information on setting up a custom docker host on the [Vagrant blog](http://www.vagrantup.com/blog/feature-preview-vagrant-1-6-docker-dev-environments.html) but basically, create Vagrantfile.proxy:
 
 ```ruby
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-Vagrant.configure(2) do |config|
+Vagrant.configure("2") do |config|
   config.vm.box = "phusion/ubuntu-14.04-amd64"
   config.vm.provision "docker"
-  config.vm.network :forwarded_port, host: 80, guest: 80
+  config.vm.network :forwarded_port, host: 8080, guest: 8080
   config.vm.provider :virtualbox do |vb|
-    vb.name = "docker-exec-proxy"
+    vb.name = "docker-proxy"
   end
 end
 ```
@@ -22,16 +20,11 @@ end
 And then use the vagrant_vagrantfile setting to reference your custom host in your Vagrantfile:
 
 ```ruby
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-Vagrant.configure(2) do |config|
-  config.vm.define "nginx" do |v|
-    v.vm.provider "docker" do |d|
-      d.image   = "dockerfile/nginx"
-      d.ports   = ["80:80"]
-      d.name    = "nginx"
-      d.vagrant_vagrantfile = "./Vagrantfile.proxy"
-    end
+Vagrant.configure("2") do |config|
+  config.vm.provider "docker" do |d|
+    d.image   = "dockerfile/nginx"
+    d.ports   = ["8080:80"]
+    d.vagrant_vagrantfile = "./Vagrantfile.proxy"
   end
 end
 ```
@@ -50,9 +43,9 @@ A common use case for the exec command is to open a new shell in a running conat
 vagrant docker-shell [container]
 ```
 
-If you're running a docker host, then you are running in a multi-host environment and the container name is required, even if only one docker container is running.
+In a single machine environment you can omit the container name and just run `vagrant docker-shell`.
 
-`docker-shell` is a shortcut for running Bash in an interactive shell:
+`docker-shell` is a shortcut for `docker-exec` running Bash in an interactive shell:
 ```bash
 vagrant docker-exec -t nginx -- bash
 ```
@@ -62,38 +55,43 @@ The syntax for `docker-exec` is:
 vagrant docker-exec [options] [container] -- [command] [args]
 ```
 
-Options are:  
---[no-]detach Run in the background  
+Options are:
+--[no-]detach Run in the background
 -t, --[no-]tty Open an interactive shell
 
-Everything after the double hyphen is sent to docker's exec command.
+In a multimachine environment `docker-exec` (and `docker-shell`) must be followed by at least 1 container name defined by `config.vm.define`. For example, for this Vagrantfile
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define "web" do |v|
+    v.vm.provider "docker" do |d|
+      d.image   = "dockerfile/nginx"
+      d.ports   = ["8082:80"]
+      d.name    = "nginx"
+      d.vagrant_vagrantfile = "./Vagrantfile.proxy"
+    end
+  end
+end
+```
 
-As an example, to create a new file in a container named `nginx`:
+The container name passed to `docker-exec` is `web` even though a docker assigned the container the name "nginx".
 
+## Examples
+Everything after the double hyphen is sent to docker's exec command. For example, to create a new file in a container named nginx:
 ```bash
-vagrant docker-exec nginx -- touch /var/www/html/test.html
+vagrant docker-exec web -- touch /var/www/html/test.html
 ```
 
 If the command produces output, the output will be prefixed with the name of the container.
 ```bash
-vagrant docker-exec nginx -- ifconfig
-==> nginx: eth0      Link encap:Ethernet  HWaddr 02:42:ac:11:00:02  
-==> nginx:           inet addr:172.17.0.2  Bcast:0.0.0.0  Mask:255.255.0.0
-==> nginx:           inet6 addr: fe80::42:acff:fe11:2/64 Scope:Link
-==> nginx:           UP BROADCAST RUNNING  MTU:1500  Metric:1
-==> nginx:           RX packets:24 errors:0 dropped:0 overruns:0 frame:0
-==> nginx:           TX packets:8 errors:0 dropped:0 overruns:0 carrier:0
-==> nginx:           collisions:0 txqueuelen:0 
-==> nginx:           RX bytes:1944 (1.9 KB)  TX bytes:648 (648.0 B)
-==> nginx: 
-==> nginx: lo        Link encap:Local Loopback  
+vagrant docker-exec nginx nginx2 -- ifconfig | grep inet
+==> nginx:           inet addr:172.17.0.5  Bcast:0.0.0.0  Mask:255.255.0.0
+==> nginx:           inet6 addr: fe80::42:acff:fe11:5/64 Scope:Link
 ==> nginx:           inet addr:127.0.0.1  Mask:255.0.0.0
 ==> nginx:           inet6 addr: ::1/128 Scope:Host
-==> nginx:           UP LOOPBACK RUNNING  MTU:65536  Metric:1
-==> nginx:           RX packets:0 errors:0 dropped:0 overruns:0 frame:0
-==> nginx:           TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
-==> nginx:           collisions:0 txqueuelen:0 
-==> nginx:           RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+==> nginx2:           inet addr:172.17.0.4  Bcast:0.0.0.0  Mask:255.255.0.0
+==> nginx2:           inet6 addr: fe80::42:acff:fe11:4/64 Scope:Link
+==> nginx2:           inet addr:127.0.0.1  Mask:255.0.0.0
+==> nginx2:           inet6 addr: ::1/128 Scope:Host
 ```
 
 The name of the container is only required for interactive shells. To run a command on multiple running containers, omit the container name:
@@ -103,6 +101,11 @@ vagrant docker-exec -- hostname
 ==> nginx2: 6ebced94866b
 ```
 
+You can also specify containers as you would any other vagrant command:
+```bash
+vagrant docker-exec /nginx\d?/ -- ps aux | grep www-data
+```
+
 Note that all exec commands run by docker are run as the root user.
 
 ## Author

data/lib/vagrant-docker-exec/command/exec.rb

@@ -50,7 +50,7 @@ module VagrantPlugins
 
         with_target_vms(argv, target_opts) do |machine|
           if machine.state.id != :running
-            @env.ui.info("#{machine.name} is not running.")
+            @env.ui.info("#{machine.id} is not running.")
             next
           end
 
@@ -65,7 +65,7 @@ module VagrantPlugins
 
         exec_cmd = %W(docker exec)
         exec_cmd << "-i" << "-t" if options[:pty]
-        exec_cmd << machine.name.to_s
+        exec_cmd << machine.id.to_s
         exec_cmd += options[:extra_args] if options[:extra_args]
         exec_cmd.concat(command)
 

data/lib/vagrant-docker-exec/command/shell.rb

@@ -25,13 +25,11 @@ module VagrantPlugins
 
         with_target_vms(argv, target_opts) do |machine|
           command = ["docker", "exec", "-it"]
-          command << machine.name.to_s
+          command << machine.id.to_s
           command << "bash"
-          
-          output = ""
-          machine.provider.driver.execute(*command, options) do |type, data|
-            output += data
-          end
+
+          machine.provider.driver.execute(*command, options)
+
         end
 
         return 0

data/lib/vagrant-docker-exec/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DockerExec
-  	VERSION = "0.1.2"
+  	VERSION = "0.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-exec
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - William Kolean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler