docker-provider 0.0.2 → 0.1.0

data/vagrant-spec.config.rb

@@ -0,0 +1,8 @@
+Vagrant::Spec::Acceptance.configure do |c|
+  c.component_paths << File.expand_path("../spec/acceptance", __FILE__)
+
+  c.provider "docker",
+    # wget http://bit.ly/vagrant-docker-precise -O precise.box
+    box: "#{File.expand_path("../", __FILE__)}/precise.box",
+    features: ['!suspend']
+end

metadata

@@ -1,67 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: docker-provider
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Experimental Docker provider for Vagrant
+description: Docker provider for Vagrant
 email:
 - fgrehm@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -69,14 +69,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- boxes/dind/.gitignore
+- boxes/dind/Dockerfile
+- boxes/dind/README.md
+- boxes/dind/Vagrantfile.sample
+- boxes/dind/metadata.json
 - boxes/dummy/README.md
 - boxes/dummy/metadata.json
-- boxes/nginx/.gitignore
-- boxes/nginx/Dockerfile
-- boxes/nginx/README.md
-- boxes/nginx/Vagrantfile.sample
-- boxes/nginx/metadata.json
-- boxes/nginx/start
 - boxes/precise/.gitignore
 - boxes/precise/Dockerfile
 - boxes/precise/README.md
@@ -95,21 +94,29 @@ files:
 - lib/docker-provider/action/forward_ports.rb
 - lib/docker-provider/action/is_running.rb
 - lib/docker-provider/action/message.rb
-- lib/docker-provider/action/share_folders.rb
+- lib/docker-provider/action/prepare_nfs_settings.rb
+- lib/docker-provider/action/prepare_nfs_valid_ids.rb
 - lib/docker-provider/action/start.rb
 - lib/docker-provider/action/stop.rb
 - lib/docker-provider/config.rb
 - lib/docker-provider/driver.rb
+- lib/docker-provider/errors.rb
 - lib/docker-provider/plugin.rb
 - lib/docker-provider/provider.rb
+- lib/docker-provider/synced_folder.rb
 - lib/docker-provider/version.rb
 - locales/en.yml
-- spec/acceptance/Vagrantfile
-- spec/acceptance/vagrant_ssh.bats
-- spec/acceptance/vagrant_up.bats
+- spec/acceptance/provider/basic_spec.rb
+- spec/acceptance/provider/network_forwarded_port_spec.rb
+- spec/acceptance/provider/synced_folder_spec.rb
+- spec/acceptance/provisioner/chef_solo_spec.rb
+- spec/acceptance/provisioner/puppet_spec.rb
+- spec/acceptance/provisioner/shell_spec.rb
+- spec/acceptance/synced_folder/nfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
 - spec/unit/driver_spec.rb
+- vagrant-spec.config.rb
 homepage: https://github.com/fgrehm/docker-provider
 licenses:
 - MIT
@@ -120,24 +127,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Experimental Docker provider for Vagrant
+summary: Docker provider for Vagrant
 test_files:
-- spec/acceptance/Vagrantfile
-- spec/acceptance/vagrant_ssh.bats
-- spec/acceptance/vagrant_up.bats
+- spec/acceptance/provider/basic_spec.rb
+- spec/acceptance/provider/network_forwarded_port_spec.rb
+- spec/acceptance/provider/synced_folder_spec.rb
+- spec/acceptance/provisioner/chef_solo_spec.rb
+- spec/acceptance/provisioner/puppet_spec.rb
+- spec/acceptance/provisioner/shell_spec.rb
+- spec/acceptance/synced_folder/nfs_spec.rb
 - spec/spec_helper.rb
 - spec/support/unit_example_group.rb
 - spec/unit/driver_spec.rb

data/boxes/nginx/.gitignore

@@ -1 +0,0 @@
-Vagrantfile

data/boxes/nginx/Dockerfile

@@ -1,4 +0,0 @@
-# Start with a docker-provider ready image
-FROM fgrehm/vagrant-ubuntu:precise
-RUN apt-get update && apt-get install nginx -y
-ADD ./start /bin/start-container

data/boxes/nginx/README.md

@@ -1,25 +0,0 @@
-# Nginx base box example
-
-This folder contains an example of a box that is able to run multiple processes.
-With the provided `Dockerfile` you'll be able to build a base box that runs both
-nginx and a SSH server that is required by Vagrant to do its "magic".
-
-
-```
-docker build -t myuser/vagrant-nginx .
-docker push myuser/vagrant-nginx
-sed 's/IMAGE/myuser\/vagrant-nginx/' Vagrantfile.sample > Vagrantfile
-tar cvzf nginx.box ./metadata.json ./Vagrantfile
-```
-
-In order to reach the nginx server running on the container you'll need to
-forward the ports with a `Vagrantfile` like the one below:
-
-```ruby
-Vagrant.configure("2") do |config|
-  # Replace with the name of the box you used when adding
-  config.vm.box = "nginx"
-  # This makes nginx accessible from the host from http://localhost:8080
-  config.vm.network "forwarded_port", guest: 80, host: 8080
-end
-```

data/boxes/nginx/start

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-/etc/init.d/nginx start
-# Make sure a SSH server is up so that Vagrant is able to SSH into it
-/usr/sbin/sshd -D -e

data/lib/docker-provider/action/share_folders.rb

@@ -1,63 +0,0 @@
-module VagrantPlugins
-	module DockerProvider
-		module Action
-			class ShareFolders
-				def initialize(app, env)
-					@app = app
-				end
-
-				def call(env)
-					@env = env
-					prepare_folders
-
-					# FIXME: Check whether the container has already been created with
-					#        different synced folders and let the user know about it
-					folders = []
-					shared_folders.each do |id, data|
-						folders << {
-							:name      => id,
-							:hostpath  => File.expand_path(data[:hostpath], @env[:root_path]),
-							:guestpath => data[:guestpath]
-						}
-					end
-					@env[:synced_folders] = folders
-
-					@app.call(env)
-				end
-
-				# This method returns an actual list of synced folders to create and their
-				# proper path.
-				def shared_folders
-					{}.tap do |result|
-						@env[:machine].config.vm.synced_folders.each do |id, data|
-							# Ignore disabled shared folders
-							next if data[:disabled]
-							# This to prevent overwriting the actual shared folders data
-							result[id] = data.dup
-						end
-					end
-				end
-
-				# Prepares the shared folders by verifying they exist and creating them
-				# if they don't.
-				def prepare_folders
-					shared_folders.each do |id, options|
-						hostpath = Pathname.new(options[:hostpath]).expand_path(@env[:root_path])
-
-						if !hostpath.directory? && options[:create]
-							# Host path doesn't exist, so let's create it.
-							@logger.debug("Host path doesn't exist, creating: #{hostpath}")
-
-							begin
-								hostpath.mkpath
-							rescue Errno::EACCES
-								raise Vagrant::Errors::SharedFolderCreateFailed,
-									:path => hostpath.to_s
-							end
-						end
-					end
-				end
-			end
-		end
-	end
-end

data/spec/acceptance/Vagrantfile

@@ -1,25 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-ENV['VAGRANT_DEFAULT_PROVIDER'] = 'docker'
-
-# This is only needed if you are using the plugin from sources with bundler
-Vagrant.require_plugin 'docker-provider'
-
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "precise"
-
-  config.vm.provider :docker do |docker|
-    docker.image = "fgrehm/vagrant-ubuntu:precise"
-    docker.cmd   = ["/usr/sbin/sshd", "-D", "-e"]
-  end
-
-  config.vm.provision :shell, inline: %[
-    echo 'hello from docker'
-    # mkdir -p /vagrant/tmp
-    # touch /vagrant/tmp/provisioned
-  ]
-end

data/spec/acceptance/vagrant_ssh.bats

@@ -1,34 +0,0 @@
-#!/usr/bin/env bats
-
-setup() {
-  if ! [ $USER = 'vagrant' ]; then
-    echo 'The specs should be run from a Vagrant VM'
-    exit 1
-  fi
-
-  # Destroy all of acceptance specs related containers
-  containers=$(docker ps -a | grep acceptance | wc -l)
-  if [ "$containers" -gt 0 ]; then
-    test_containers=$(docker ps -a | grep acceptance | cut -d' ' -f1)
-    docker stop -t=1 $test_containers
-    docker rm $test_containers
-  fi
-  rm -rf /vagrant/spec/acceptance/{.vagrant,tmp}
-}
-
-@test "vagrant ssh on a stopped container errors out" {
-  cd /vagrant/spec/acceptance
-
-  run bundle exec vagrant ssh
-  [ "$status" -eq 1 ]
-}
-
-@test "vagrant ssh on a runing container" {
-  cd /vagrant/spec/acceptance
-  bundle exec vagrant up
-
-  run bundle exec vagrant ssh -c 'echo "hello from ssh"'
-
-  [ "$status" -eq 0 ]
-  echo $output | grep -q 'hello from ssh'
-}

data/spec/acceptance/vagrant_up.bats

@@ -1,35 +0,0 @@
-#!/usr/bin/env bats
-
-setup() {
-  if ! [ $USER = 'vagrant' ]; then
-    echo 'The specs should be run from a Vagrant VM'
-    exit 1
-  fi
-
-  # Destroy all of acceptance specs related containers
-  containers=$(docker ps -a | grep acceptance | wc -l)
-  if [ "$containers" -gt 0 ]; then
-    test_containers=$(docker ps -a | grep acceptance | cut -d' ' -f1)
-    docker stop -t=1 $test_containers
-    docker rm $test_containers
-  fi
-  rm -rf /vagrant/spec/acceptance/{.vagrant,tmp}
-}
-
-@test "vagrant up from scratch runs a docker container" {
-  cd /vagrant/spec/acceptance
-
-  run bundle exec vagrant up
-  [ "$status" -eq 0 ]
-
-  # How many test containers have we got?
-  count=$(docker ps | grep acceptance | wc -l)
-  [ "$count"  -eq 1 ]
-}
-
-@test "vagrant up from scratch provisions docker container" {
-  cd /vagrant/spec/acceptance
-  run bundle exec vagrant up
-
-  echo $output | grep -q 'hello from docker'
-}