vocker 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c85ef7c68884d8019894cc7d582743749470350b
-  data.tar.gz: 8afc3a12d801e8a57b6906cf2033b70bd5df232c
+  metadata.gz: 01ebe4e117bf2353cbc0ce30465d58fcde38ab67
+  data.tar.gz: 4414a6eef3b96935e53ea2346676aa329e1d80a7
 SHA512:
-  metadata.gz: 60c268d5a0c91851e414f6eda5c88a057169288a3f90d312836ad5fea4868ea7d19cd8655ac25db35646839babd6585e115303dfee6adec9c507e7c909110c8d
-  data.tar.gz: d8dda39a64b9b09e2ee38534ee36259516825413cb3b9810b010300efb7adc08f8a8c8bac0a4c342be6f7c9eed1a980e974b2c63a12ee8499733f29b377ce7aa
+  metadata.gz: 6b18a0828dc7f538e0d35d0832e71239a0d4c60ee596366d1050a4214947dc2ce7f43bb4f41fe9212d0b90af274da4897a3d9b675379543123586a962c7c8ca8
+  data.tar.gz: 53d6655eceab26f844e48c12c4aa4da9d578abef09a58a41ccdda58d16e6321e21e75f193253a18caedce57c91a8a0eab72d08b3a714de5fea3c95e9ccfb256c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.3.2](https://github.com/fgrehm/vocker/compare/v0.3.1...v0.3.2) (October 12, 2013)
+
+  - Add support for additional parameters to be passed to the docker run cmd [GH-8](https://github.com/fgrehm/vocker/pull/8)
+  - Add `vagrant` user to the docker group in order to avoid "sudoing" [GH-5](https://github.com/fgrehm/vocker/issues/5)
+  - Attempt to start the docker service if it is not running
+
 ## [0.3.1](https://github.com/fgrehm/vocker/compare/v0.3.0...v0.3.1) (October 3, 2013)
 
   - Check if container is running before trying to restart

data/Gemfile.lock

@@ -13,7 +13,7 @@ GIT
 PATH
   remote: .
   specs:
-    vocker (0.3.1)
+    vocker (0.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -75,7 +75,7 @@ GEM
     thor (0.18.1)
     vagrant-cachier (0.3.2)
     vagrant-global-status (0.1.1)
-    vagrant-lxc (0.5.0)
+    vagrant-lxc (0.6.3)
     vagrant-pristine (0.2.0)
 
 PLATFORMS

data/README.md

@@ -65,6 +65,7 @@ containers to run:
 ```ruby
 Vagrant.configure("2") do |config|
   config.vm.provision :docker do |docker|
+    # If you just want to pull in some base images
     docker.pull_images 'ubuntu', 'busybox'
 
     # Command + image
@@ -76,7 +77,11 @@ Vagrant.configure("2") do |config|
     # Base image (requires ENTRYPOINT / CMD) to be configured:
     #   * http://docs.docker.io/en/latest/use/builder/#entrypoint
     #   * http://docs.docker.io/en/latest/use/builder/#cmd
-    docker.run 'mysql'
+    docker.run 'user/mysql'
+
+    # If you need to go deeper, you can pass in additional `docker run` arguments
+    # Same as: docker run -v /host:/container -p 1234:3306 user/patched-mysql /usr/bin/mysql
+    docker.run mysql: { additional_run_args: '-v /host:/container -p 1234:3306', image: 'user/patched-mysql', cmd: '/usr/bin/mysql'}
   end
 end
 ```

data/development/Vagrantfile

@@ -19,18 +19,12 @@ Vagrant.configure("2") do |config|
     lxc.customize 'aa_profile', 'unconfined'
   end
 
+  # Required to boot nested containers
   config.vm.provision :shell, inline: %[
     if ! [ -f /etc/default/lxc ]; then
       cat <<STR > /etc/default/lxc
-LXC_AUTO="true"
-USE_LXC_BRIDGE="true"
-LXC_BRIDGE="lxcbr0"
-LXC_ADDR="10.0.253.1"
-LXC_NETMASK="255.255.255.0"
-LXC_NETWORK="10.0.253.0/24"
-LXC_DHCP_RANGE="10.0.253.2,10.0.253.254"
-LXC_DHCP_MAX="253"
-LXC_SHUTDOWN_TIMEOUT=120
+LXC_AUTO="false"
+USE_LXC_BRIDGE="false"
 STR
     fi
   ]
@@ -38,9 +32,9 @@ STR
   config.vm.define :vm1 do |vm1|
     vm1.vm.provision :docker do |docker|
       docker.pull_images 'ubuntu', 'busybox'
-      docker.run 'echo ls -la --color', 'ubuntu'
-      docker.run 'echo ls -la --color', image: 'ubuntu'  # Above is the default
-      docker.run 'date', image: 'ubuntu', cmd: '/bin/sh -c "while true; date; do echo hello world; sleep 1; done"'
+      docker.run 'echo ls -la --color', 'busybox'
+      docker.run 'echo ls -la --color', image: 'busybox'  # Above is the default
+      docker.run 'date', additional_run_args: '-p 1234:562', image: 'busybox', cmd: '/bin/sh -c "while true; date; do echo hello world; sleep 1; done"'
     end
   end
 

data/lib/vocker/cap/debian/docker_configure_vagrant_user.rb

@@ -0,0 +1,14 @@
+module VagrantPlugins
+  module Vocker
+    module Cap
+      module Debian
+        module DockerConfigureVagrantUser
+          def self.docker_configure_vagrant_user(machine)
+            # FIXME: We should make use of the config.ssh.username here
+            machine.communicate.sudo("usermod -a -G docker vagrant")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vocker/cap/debian/docker_start_service.rb

@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module Vocker
+    module Cap
+      module Debian
+        module DockerStartService
+          def self.docker_start_service(machine)
+            machine.communicate.sudo("service docker start")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vocker/docker_client.rb

@@ -15,6 +15,12 @@ module VagrantPlugins
         end
       end
 
+      def start_service
+        if !daemon_running? && @machine.guest.capability?(:docker_start_service)
+          @machine.guest.capability(:docker_start_service)
+        end
+      end
+
       def daemon_running?
         @machine.communicate.test('test -f /var/run/docker.pid')
       end
@@ -58,6 +64,7 @@ module VagrantPlugins
       def create_container(config)
         args = "-cidfile=#{config[:cidfile]} -d"
         args << " -dns=#{config[:dns]}" if config[:dns]
+        args << " #{config[:additional_run_args]}" if config[:additional_run_args]
         @machine.communicate.sudo %[
           rm -f #{config[:cidfile]}
           docker run #{args} #{config[:image]} #{config[:cmd]}

data/lib/vocker/docker_installer.rb

@@ -30,6 +30,10 @@ module VagrantPlugins
         else
           @machine.env.ui.warn I18n.t('vagrant.docker_auto_start_not_available')
         end
+
+        if @machine.guest.capability?(:docker_configure_vagrant_user)
+          @machine.guest.capability(:docker_configure_vagrant_user)
+        end
       end
     end
   end

data/lib/vocker/plugin.rb

@@ -26,6 +26,16 @@ module VagrantPlugins
         Cap::Debian::DockerConfigureAutoStart
       end
 
+      guest_capability("debian", "docker_configure_vagrant_user") do
+        require_relative "cap/debian/docker_configure_vagrant_user"
+        Cap::Debian::DockerConfigureVagrantUser
+      end
+
+      guest_capability("debian", "docker_start_service") do
+        require_relative "cap/debian/docker_start_service"
+        Cap::Debian::DockerStartService
+      end
+
       guest_capability("linux", "docker_installed") do
         require_relative "cap/linux/docker_installed"
         Cap::Linux::DockerInstalled

data/lib/vocker/provisioner.rb

@@ -19,6 +19,8 @@ module VagrantPlugins
         @logger.info("Checking for Docker installation...")
         @installer.ensure_installed
 
+        # Attempt to start service if not running
+        @client.start_service
         unless @client.daemon_running?
           raise Errors::DockerNotRunning
         end

data/lib/vocker/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vocker
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

data/spec/unit/docker_client_spec.rb

@@ -56,6 +56,13 @@ describe VagrantPlugins::Vocker::DockerClient do
       expect(communicator).to have_received.sudo(with{|cmd| cmd =~ /-dns=127\.0\.0\.1/})
     end
 
+    it 'allows additional params to be passed to the run command if specified' do
+      stub(communicator).test(with{|cmd| cmd =~ /docker ps/}) { false }
+      containers['mysql'][:additional_run_args] = '-p 49176:5601 -p 49175:514'
+      subject.run containers
+      expect(communicator).to have_received.sudo(with{|cmd| cmd =~ /-p 49176:5601 -p 49175:514/})
+    end
+
     context 'when the container already exists' do
       before do
         stub(communicator).test(with{|cmd| cmd =~ /docker ps -a -q/}) { true }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vocker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,9 @@ files:
 - development/Vagrantfile
 - lib/vocker.rb
 - lib/vocker/cap/debian/docker_configure_auto_start.rb
+- lib/vocker/cap/debian/docker_configure_vagrant_user.rb
 - lib/vocker/cap/debian/docker_install.rb
+- lib/vocker/cap/debian/docker_start_service.rb
 - lib/vocker/cap/linux/docker_installed.rb
 - lib/vocker/command.rb
 - lib/vocker/config.rb
@@ -96,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Introduces Docker to Vagrant