docker-api 0.0.5 → 0.0.6

data/README.md

@@ -131,9 +131,13 @@ Docker::Image.all
 Docker::Image.search('term' => 'sshd')
 # => [Docker::Image { :id => cespare/sshd, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => johnfuller/sshd, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => dhrp/mongodb-sshd, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => rayang2004/sshd, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => dhrp/sshd, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => toorop/daemontools-sshd, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => toorop/daemontools-sshd-nginx, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => toorop/daemontools-sshd-nginx-php-fpm, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => mbkan/lamp, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => toorop/golang, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => wma55/u1210sshd, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => jdswinbank/sshd, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }, Docker::Image { :id => vgauthier/sshd, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }]
 
-# Create an Image from a Dockerfile.
+# Create an Image from a Dockerfile as a String.
 Docker::Image.build("from base\nrun touch /test")
 # => Docker::Image { :id => b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }
+
+# Create an Image from a Dockerfile.
+Dockerfile::Image.build_from_file(File.new('Dockerfile'))
+# => Docker::Image { :id => 1266dc19e, :connection => Docker::Connection { :url => http://localhost, :options => {:port=>4243} } }
 ```
 
 ## Containers

data/docker-api.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'json'
   gem.add_dependency 'i18n'
   gem.add_dependency 'multipart-post'
+  gem.add_dependency 'archive-tar-minitar'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'cane'

data/lib/docker.rb

@@ -1,6 +1,9 @@
 require 'cgi'
 require 'json'
+require 'zlib'
 require 'excon'
+require 'tempfile'
+require 'archive/tar/minitar'
 require 'net/http/post/multipart'
 
 # The top-level module for this gem. It's purpose is to hold global

data/lib/docker/image.rb

@@ -86,12 +86,34 @@ class Docker::Image
 
     # Given a Dockerfile as a string, builds an Image.
     def build(commands, connection = Docker.connection)
-      body = multipart_request(
+      req = build_multipart_post('/build', :io => StringIO.new("#{commands}\n"),
+                                           :name => 'Dockerfile',
+                                           :file_name => 'Dockerfile',
+                                           :content_type => 'text/plain')
+      body = multipart_request(connection, req)
+      new(:id => extract_id(body), :connection => connection)
+    end
+
+    def build_from_file(file, connection = Docker.connection)
+      path = File.dirname(File.absolute_path(file.to_path))
+      context_io = create_tar_gz(path)
+      req = build_multipart_post(
         '/build',
-        'Dockerfile',
-        StringIO.new("#{commands}\n"),
-        connection
+        {
+          :io => file,
+          :name => 'Dockerfile',
+          :file_name => 'Dockerfile',
+          :content_type => 'text/plain'
+        },
+        {
+          :io =>  context_io,
+          :name => 'Context',
+          :file_name => 'dir.tar.gz',
+          :content_type => 'application/octet-stream'
+        }
       )
+      body = multipart_request(connection, req)
+      context_io.close
       new(:id => extract_id(body), :connection => connection)
     end
 
@@ -103,5 +125,12 @@ class Docker::Image
         raise UnexpectedResponseError, "Couldn't find id: #{body}"
       end
     end
+
+    def create_tar_gz(directory)
+      tempfile = Tempfile.new('output')
+      zlb = Zlib::GzipWriter.new(tempfile)
+      Archive::Tar::Minitar.pack(directory, zlb)
+      File.new(tempfile.path, 'r')
+    end
   end
 end

data/lib/docker/multipart.rb

@@ -3,12 +3,9 @@ module Docker::Multipart
   include Docker::Error
 
   # Given a path, resource name, io, and Connection sends a multipart request.
-  def multipart_request(path, name, io, connection)
+  def multipart_request(connection, request)
     host, port = host_and_port(connection)
-    res = Net::HTTP.start(host, port) { |http|
-      req = build_multipart_post(path, io, 'application/octet-stream', name)
-      http.request(req)
-    }
+    res = Net::HTTP.start(host, port) { |http| http.request(request) }
     if (200..204).include?(res.code.to_i)
       res.body
     else
@@ -16,15 +13,19 @@ module Docker::Multipart
     end
   end
 
+  def build_multipart_post(path, *io_opts_list)
+    options = Hash[io_opts_list.map { |opts|
+      [
+        opts[:name],
+        UploadIO.new(opts[:io], opts[:content_type], opts[:file_name])
+      ]
+    }]
+    Net::HTTP::Post::Multipart.new(path, options)
+  end
+
 private
   # Return the host and port from a Connection.
   def host_and_port(connection)
     [URI.parse(connection.url).host, connection.options[:port]]
   end
-
-  # Build the multipart post request.
-  def build_multipart_post(path, inner_io, content_type, file_name)
-    io = UploadIO.new(inner_io, content_type, file_name)
-    Net::HTTP::Post::Multipart.new(path, file_name => io)
-  end
 end

data/lib/docker/version.rb

@@ -1,3 +1,3 @@
 module Docker
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/docker/image_spec.rb

@@ -409,14 +409,36 @@ describe Docker::Image do
       end
     end
 
-    context 'with a valid Dockerfile', :vcr do
+    context 'with a valid Dockerfile' do
       let(:image) { subject.build("from base\n") }
 
-      it 'builds an image' do
+      it 'builds an image', :vcr do
         image.should be_a Docker::Image
         image.id.should_not be_nil
         image.connection.should be_a Docker::Connection
       end
     end
   end
+
+  describe '.build_from_file' do
+    subject { described_class }
+
+    context 'with a valid Dockerfile' do
+      let(:file_name) do
+        File.join(File.dirname(__FILE__), '..', 'fixtures', 'Dockerfile')
+      end
+      let(:docker_file) { File.new(file_name) }
+      let(:image) { subject.build_from_file(docker_file) }
+      let(:container) do
+        Docker::Container.new.create!('Image' => image.id,
+                                      'Cmd' => %w[cat /Dockerfile])
+      end
+      let(:output) { container.tap(&:start)
+                              .attach(:stream => true, :stdout => true) }
+
+      it 'builds the image', :vcr do
+        output.should == docker_file.read
+      end
+    end
+  end
 end

data/spec/fixtures/Dockerfile

@@ -0,0 +1,2 @@
+from base
+add / Dockerfile

data/spec/vcr/Docker_Image/_build_from_file/with_a_valid_Dockerfile/builds_the_image.yml

@@ -0,0 +1,179 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:4243/build
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        LS0tLS0tLS0tLS0tLVJ1YnlNdWx0aXBhcnRQb3N0DQpDb250ZW50LURpc3Bv
+        c2l0aW9uOiBmb3JtLWRhdGE7IG5hbWU9IkRvY2tlcmZpbGUiOyBmaWxlbmFt
+        ZT0iRG9ja2VyZmlsZSINCkNvbnRlbnQtTGVuZ3RoOiAyNw0KQ29udGVudC1U
+        eXBlOiB0ZXh0L3BsYWluDQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiBi
+        aW5hcnkNCg0KZnJvbSBiYXNlCmFkZCAvIERvY2tlcmZpbGUKDQotLS0tLS0t
+        LS0tLS0tUnVieU11bHRpcGFydFBvc3QNCkNvbnRlbnQtRGlzcG9zaXRpb246
+        IGZvcm0tZGF0YTsgbmFtZT0iQ29udGV4dCI7IGZpbGVuYW1lPSJkaXIudGFy
+        Lmd6Ig0KQ29udGVudC1MZW5ndGg6IDE3MjENCkNvbnRlbnQtVHlwZTogYXBw
+        bGljYXRpb24vb2N0ZXQtc3RyZWFtDQpDb250ZW50LVRyYW5zZmVyLUVuY29k
+        aW5nOiBiaW5hcnkNCg0KH4sIANOfxFEAA+3dDVAUVRwA8MWaUQ/xIyEUnWGR
+        9EDgdvfu4OD00DRRVBQcQE2TFm6BlYM77vZAEKUsNBE10zQHyBQlYCIEjRBR
+        bAQNP/MrNUEtIPwgJYKID712T84PHAPETsv/b+bNu/14b9/u293ZN7f/WSxU
+        GU5hTKhWQYeSEZgmmlZRihhMrgwKo9ROpIrGNCoqCAumFzFaNaVBngaOi3GJ
+        xJnNcULijD+cGyCEkHAhCMJZLGLnExKCkCCo81NtrZu0GoZUs00xxrZeQFj3
+        +h8TvKVfEkwrKIEmWtWlbeAEjrvg+BP6X/Ro/3PzhUJcJEZQo/TJS97/gbi/
+        pxcqEYi4iYEIMiS5xKfClEHOoghiOCs6q4NSkHQE1fm2lnb9NHtwlvV4DwEA
+        95ghIiGhv9XZjrBBB7/m97wbBAAAAAAAADAiRmWCxLN5r/ZpQ27SIQcAAAAA
+        AAAAAMB/FylHkO8GIEg1m7j//w3j/z8N8wAAAAAAAAAAAPCCIOVyFEOfGMtx
+        b/FD79QHq5XhaCCpobof/8FQGkagDuxy8AfSHv8hFncl/gN3Ibj4D0IklkD8
+        hzF0jP9I+rjE5wzvucd/tJ9lPd49AMB9EP8BAAAAAADAy6xj/Idpew7xHwAA
+        AAAAAAAAwP8HF/+RbYYgjWzi/v83jP8vD0CQCjYVsknFJgGbavojSDKb3mST
+        BZua2ss1mD3PPQAAAAAAAAAA8ERLEBRVaRkNGsowKoGaitRSGsaOze0FgUp5
+        DDKDYqTSKb6+3gLu5XjGjq9QBpGKUKWG4TuiYqFYZI8uRuO4wnEIWwqVofdL
+        SKXe7GpSqZdWwdAqtrAggoq242OBWlohZ0vzJyojGGoRw0dl7iitZGc8CEvQ
+        z1MyoZQ6gFbaI4ZfbPV+KoWSlHvO1FfmwX17Ql/rQ0Xt2Zq4ejEV9zI6/9F6
+        7ZHHa+EWsGuRKpWCDiIZWhmBKYMYinHSMGqKDOdqMLyNLmAPgiAklq3GFu3Z
+        7nI19LwpgbFCti1cKbamB0fj8eZynaOl1RTKj6AYjOsvTMU2Fws3tJbf7fiP
+        p/kwgz7+w+VJ8R9cCIjo0e+/CAl2AuI/jOF+JBCvY5AQ73k3DRhBd6//DjeZ
+        Lm2jk+ufEOOG6x+XuIgJ7vs/hMQFrn9jsF7VB9m6tsQHeeW3CpnyzPghveu+
+        /KisT+K7crdrVz22uRe/kW+e6VgUZbd71tHElKqsOa65uScXmjrd6VU3ck7z
+        QEcLB1OHOJOo4FsTyid4D8sq2nBaN1Oa+kn5xbWakGk+t07NTRl1wn/ZF+lh
+        /IyLxT+OVM8/HD38Us6erNRK33e2zAmv3zrIYk8/0aEp+atcF66oSPvJrLUt
+        Ka9Ai9Hulhc9zE0drkznq/rLDuwPtybuXr5dedttYdu5ur0ltX1L6ldo3O+a
+        tV4/LTR1nFlcMHX33ah4beu27Sdrb2NzS8izFgdPNhaORU9K0nxLLhWdS441
+        Ja1+H2vhtX9QeNmIwW7jUtbbBtggbczmseevy/xrIirk53Oyt0SN1x8WfJIw
+        davML+BaseDm5vet2g/Wia93TmqI2HgtbXSLTlffpGuql7Uv+Wvyh9mvVyZ9
+        u37N1cNOefF20n3OjcPmniZX45ZS3cTE+W/PDZpQZs3ktQ04fKrZesHxpnU6
+        wuyDZuumK7U5SwuZG83Wd9zc6qtNDphUxesrTAlhl3oUe9ztfW8DB3QTa+LL
+        CyY0TLe4o4tvbtXddDxl6eeeMSvjl8x6r29ico58Ppq82L7ye6Gbhkwz3bwr
+        f0PmpystE76vLspy8Lelw88E2dxsnBwW5rBxwXKs5rgrvTxyTNmOmGS/iqzZ
+        ZM6FNbeKJmZZzpP3lt1otDj31YIAQeDQHVm7zlkk/zFKae5TPmvf8b2esxOd
+        6LzSMY5TR5uPzGqNteKTYdc9c3JPJHibHRSvTgu2S9t+dH26udpm0+Y+Y1rQ
+        6kRmWkKI84LC4IRfL2SsO5YbWbptcaat7Ifk6IYZsQWRy1p846lJG/oGRyVU
+        tcyrykzcEH1kvFde+s6z+zfpfp69tlxXmiNd0Wydf1lXalZuVT8unbzWj0gK
+        qvmMyN+jSIoLGFqZKD/rOqPOV7RmibvV3kN1NsNXOidk+y+v0EVd7V+rq/JL
+        RZp04uHyXlb8YzYpDSWv6o9QbqvJFKuAFmSRka6zF1V37/9PE5jZ2f0fJ+4/
+        /7GPfux6Qlzs4gz3f2PodITA43U+0OA9s1ENr8cjLN6zGerxnuHok/evjZF5
+        3Rip8/5xzM9bAs/7AADwMvkbF0sKYAB6AAANCi0tLS0tLS0tLS0tLS1SdWJ5
+        TXVsdGlwYXJ0UG9zdC0tDQoNCg==
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - multipart/form-data; boundary=-----------RubyMultipartPost
+      Content-Length:
+      - '2179'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - text/plain; charset=utf-8
+      Date:
+      - Fri, 21 Jun 2013 18:47:47 GMT
+      Transfer-Encoding:
+      - chunked
+    body:
+      encoding: US-ASCII
+      string: ! 'FROM base ()
+
+        ===> b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc
+
+        ADD / Dockerfile (b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc)
+
+        ===> e495b94e01c093c92998c1d181fcedf53e3ff6d40887b640f9ea14600bd69a06
+
+        Build successful.
+
+        ===> e495b94e01c093c92998c1d181fcedf53e3ff6d40887b640f9ea14600bd69a06
+
+'
+    http_version: 
+  recorded_at: Fri, 21 Jun 2013 18:47:47 GMT
+- request:
+    method: post
+    uri: http://localhost:4243/containers/create
+    body:
+      encoding: UTF-8
+      string: ! '{"Image":"e495b94e01c093c92998c1d181fcedf53e3ff6d40887b640f9ea14600bd69a06","Cmd":["cat","/Dockerfile"]}'
+    headers:
+      Content-Type:
+      - text/plain
+      User-Agent:
+      - Docker-Client/1.2
+  response:
+    status:
+      code: 201
+      message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        dGV4dC9wbGFpbjsgY2hhcnNldD11dGYtOA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MjE=
+      !binary "RGF0ZQ==":
+      - !binary |-
+        RnJpLCAyMSBKdW4gMjAxMyAxODo0Nzo0NyBHTVQ=
+    body:
+      encoding: US-ASCII
+      string: ! '{"Id":"4fce10ce5469"}'
+    http_version: 
+  recorded_at: Fri, 21 Jun 2013 18:47:47 GMT
+- request:
+    method: post
+    uri: http://localhost:4243/containers/4fce10ce5469/start
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - text/plain
+      User-Agent:
+      - Docker-Client/1.2
+  response:
+    status:
+      code: 204
+      message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        dGV4dC9wbGFpbjsgY2hhcnNldD11dGYtOA==
+      !binary "Q29udGVudC1MZW5ndGg=":
+      - !binary |-
+        MA==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        RnJpLCAyMSBKdW4gMjAxMyAxODo0Nzo0NyBHTVQ=
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Fri, 21 Jun 2013 18:47:47 GMT
+- request:
+    method: post
+    uri: http://localhost:4243/containers/4fce10ce5469/attach?stdout=true&stream=true
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - text/plain
+      User-Agent:
+      - Docker-Client/1.2
+  response:
+    status:
+      code: 200
+      message: ''
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vdm5kLmRvY2tlci5yYXctc3RyZWFt
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Fri, 21 Jun 2013 18:47:48 GMT
+recorded_with: VCR 2.5.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -198,6 +214,7 @@ files:
 - spec/docker/container_spec.rb
 - spec/docker/image_spec.rb
 - spec/docker_spec.rb
+- spec/fixtures/Dockerfile
 - spec/spec_helper.rb
 - spec/support/vcr.rb
 - spec/vcr/Docker/_info/returns_the_info_as_a_Hash.yml
@@ -217,6 +234,7 @@ files:
 - spec/vcr/Docker_Image/_all/when_the_HTTP_response_is_a_200/materializes_each_Container_into_a_Docker_Container.yml
 - spec/vcr/Docker_Image/_build/with_a_valid_Dockerfile/builds_an_image.yml
 - spec/vcr/Docker_Image/_build/with_an_invalid_Dockerfile/throws_a_UnexpectedResponseError.yml
+- spec/vcr/Docker_Image/_build_from_file/with_a_valid_Dockerfile/builds_the_image.yml
 - spec/vcr/Docker_Image/_create_/when_the_Image_does_not_yet_exist_and_the_body_is_a_Hash/when_the_HTTP_request_returns_a_200/sets_the_id.yml
 - spec/vcr/Docker_Image/_create_from_file/when_the_file_does_exist/when_the_Image_has_not_been_created/creates_the_Image.yml
 - spec/vcr/Docker_Image/_history/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/returns_the_history_of_the_Image.yml
@@ -254,6 +272,7 @@ test_files:
 - spec/docker/container_spec.rb
 - spec/docker/image_spec.rb
 - spec/docker_spec.rb
+- spec/fixtures/Dockerfile
 - spec/spec_helper.rb
 - spec/support/vcr.rb
 - spec/vcr/Docker/_info/returns_the_info_as_a_Hash.yml
@@ -273,6 +292,7 @@ test_files:
 - spec/vcr/Docker_Image/_all/when_the_HTTP_response_is_a_200/materializes_each_Container_into_a_Docker_Container.yml
 - spec/vcr/Docker_Image/_build/with_a_valid_Dockerfile/builds_an_image.yml
 - spec/vcr/Docker_Image/_build/with_an_invalid_Dockerfile/throws_a_UnexpectedResponseError.yml
+- spec/vcr/Docker_Image/_build_from_file/with_a_valid_Dockerfile/builds_the_image.yml
 - spec/vcr/Docker_Image/_create_/when_the_Image_does_not_yet_exist_and_the_body_is_a_Hash/when_the_HTTP_request_returns_a_200/sets_the_id.yml
 - spec/vcr/Docker_Image/_create_from_file/when_the_file_does_exist/when_the_Image_has_not_been_created/creates_the_Image.yml
 - spec/vcr/Docker_Image/_history/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/returns_the_history_of_the_Image.yml
@@ -281,3 +301,4 @@ test_files:
 - spec/vcr/Docker_Image/_remove/when_the_Image_has_been_created/when_the_HTTP_response_status_is_204/nils_out_the_id.yml
 - spec/vcr/Docker_Image/_search/when_the_HTTP_response_is_a_200/materializes_each_Container_into_a_Docker_Container.yml
 - spec/vcr/Docker_Image/_tag/when_the_Image_has_been_created/when_the_HTTP_response_status_is_200/tags_the_image_with_the_repo_name.yml
+has_rdoc: