docker-api 1.23.0 → 1.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fab8042f6b472f3aee3283d18c822fe3b9e7e35d
-  data.tar.gz: df6af05cba4552155fc735acd2d1754f8c088ac9
+  metadata.gz: 7a6840558745f8a4830affbdc1168b007433a797
+  data.tar.gz: aa3fbadccdde9a27d4352eea386e7613ee2026ae
 SHA512:
-  metadata.gz: aa04e4b157cd1a0e8b2cc881dfd59f4e754cb95dfb89b0cd304b33d3082359982d4131b1e7136edde559351452267c93992fa18dd64664f3daec485556d5fefe
-  data.tar.gz: c7414e392a8a770888a5c3a44908a732dec432603c0466482b6d07ca4e1935f156ea200f912f75652397625439b4dbc348309444f834db0a39f6f6069c873883
+  metadata.gz: af38dc7391984c580435d1180d72baa5235e28983c95b51a6e78b7401ab1818397f08a0ace2ecfaf1fd8da9a5c41966e819f104ef77e9b59743167d94d95697d
+  data.tar.gz: 9093e43ab34024974ebeec8b73ceb8427d14455aa49c409c0144c3f9f4030b8945af8288992a209b7504d8fdb5a0ba9a3607c7d0113292b9bade688fd8425d13

data/.cane

@@ -1,2 +1,2 @@
---abc-max 17
+--abc-max 19
 --style-measure 100

data/.rspec

@@ -0,0 +1 @@
+--order rand

data/.travis.yml

@@ -1,9 +1,10 @@
-sudo: false
+sudo: required
+services:
+  - docker
 cache: bundler
 language: ruby
 rvm:
-    - 1.9.2
-    - 1.9.3
-    - 2.0
-    - 2.1
-    - 2.2
+  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2

data/Dockerfile

@@ -0,0 +1,2 @@
+FROM scratch
+ADD Dockerfile /Dockerfile

data/README.md

@@ -387,24 +387,24 @@ container.run('pwd', 10)
 # => Docker::Image { :id => 4427be4199ac, :connection => Docker::Connection { :url => tcp://localhost, :options => {:port=>2375} } }
 
 # Run an Exec instance inside the container and capture its output and exit status
-container.exec('date')
+container.exec(['date'])
 # => [["Wed Nov 26 11:10:30 CST 2014\n"], [], 0]
 
 # Launch an Exec instance without capturing its output or status
-container.exec('./my_service', detach: true)
+container.exec(['./my_service'], detach: true)
 # => Docker::Exec { :id => be4eaeb8d28a, :connection => Docker::Connection { :url => tcp://localhost, :options => {:port=>2375} } }
 
 # Parse the output of an Exec instance
-container.exec('find / -name *') { |stream, chunk| puts "#{stream}: #{chunk}" }
+container.exec(['find', '/', '-name *']) { |stream, chunk| puts "#{stream}: #{chunk}" }
 stderr: 2013/10/30 17:16:24 Unable to locate find / -name *
 # => [[], ["2013/10/30 17:16:24 Unable to locate find / -name *\n"], 1]
 
 # Run an Exec instance by grab only the STDOUT output
-container.exec('date', stderr: false)
+container.exec(['date'], stderr: false)
 # => [["Wed Nov 26 11:10:30 CST 2014\n"], [], 0]
 
 # Pass input to an Exec instance command via Stdin
-container.exec('cat', stdin: StringIO.new("foo\nbar\n"))
+container.exec(['cat'], stdin: StringIO.new("foo\nbar\n"))
 # => [["foo\nbar\n"], [], 0]
 
 # Get the raw stream of data from an Exec instance

data/Rakefile

@@ -5,7 +5,9 @@ require 'docker'
 require 'rspec/core/rake_task'
 require 'cane/rake_task'
 
-task :default => [:spec, :quality]
+
+desc 'Run the full test suite from scratch'
+task :default => [:unpack, :rspec, :quality]
 
 RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
@@ -15,38 +17,31 @@ Cane::RakeTask.new(:quality) do |cane|
   cane.canefile = '.cane'
 end
 
-dir = File.expand_path(File.dirname(__FILE__))
-namespace :vcr do
-  desc 'Run the full test suite from scratch'
-  task :spec => [:unpack, :record]
-
-  desc 'Download the necessary base images'
-  task :unpack do
-    %w( registry busybox tianon/true scratch debian:wheezy ).each do |image|
-      system "docker pull #{image}"
-    end
+desc 'Download the necessary base images'
+task :unpack do
+  %w( swipely/base registry busybox tianon/true debian:wheezy ).each do |image|
+    system "docker pull #{image}"
   end
+end
 
-  desc 'Run spec tests and record VCR cassettes'
-  task :record do
-    begin
-      FileUtils.remove_dir("#{dir}/spec/vcr", true)
-      registry = Docker::Container.create(
-        'name' => 'registry',
-        'Image' => 'registry',
-        'Env' => ["GUNICORN_OPTS=[--preload]"],
-        'ExposedPorts' => {
-          '5000/tcp' => {}
-        },
-        'HostConfig' => {
-          'PortBindings' => { '5000/tcp' => [{ 'HostPort' => '5000' }] }
-        }
-      )
-      registry.start
-      Rake::Task["spec"].invoke
-    ensure
-      registry.kill!.remove unless registry.nil?
-    end
+desc 'Run spec tests with a registry'
+task :rspec do
+  begin
+    registry = Docker::Container.create(
+      'name' => 'registry',
+      'Image' => 'registry',
+      'Env' => ["GUNICORN_OPTS=[--preload]"],
+      'ExposedPorts' => {
+        '5000/tcp' => {}
+      },
+      'HostConfig' => {
+        'PortBindings' => { '5000/tcp' => [{ 'HostPort' => '5000' }] }
+      }
+    )
+    registry.start
+    Rake::Task["spec"].invoke
+  ensure
+    registry.kill!.remove unless registry.nil?
   end
 end
 

data/TESTING.md

@@ -22,40 +22,28 @@ $ bundle install
 $ git checkout -b my_bug_fix
 ```
 4. Make any changes
-5. Write tests to support those changes.  
+5. Write tests to support those changes.
 6. Run the tests:
-  * `bundle exec rake vcr:spec`
+  * `bundle exec rake`
 7. Assuming the tests pass, open a Pull Request on Github.
 
 # Using Rakefile Commands
 This repository comes with five Rake commands to assist in your testing of the code.
 
-## `rake spec`
-This command will run Rspec tests normally on your local system. Be careful that VCR will behave "weirdly" if you currently have the Docker daemon running.
+## `rake rspec`
+This command will run Rspec tests normally on your local system. You must have all the required base images pulled.
 
 ## `rake quality`
 This command runs a code quality threshold checker to hinder bad code.
 
-## `rake vcr`
-This gem uses [VCR](https://relishapp.com/vcr/vcr) to record and replay HTTP requests made to the Docker API. The `vcr` namespace is used to record and replay spec tests inside of a Docker container. This will allow each developer to run and rerecord VCR cassettes in a consistent environment.
+## `rake unpack`
+Pulls down all the required base images for testing.
 
 ### Setting Up Environment Variables
-Certain Rspec tests will require your credentials to the Docker Hub. If you do not have a Docker Hub account, you can sign up for one [here](https://hub.docker.com/account/signup/). To avoid hard-coding credentials into the code the test suite leverages three Environment Variables: `DOCKER_API_USER`, `DOCKER_API_PASS`, and `DOCKER_API_EMAIL`. You will need to configure your work environment (shell profile, IDE, etc) with these values in order to successfully re-record VCR cassettes.
+Certain Rspec tests will require your credentials to the Docker Hub. If you do not have a Docker Hub account, you can sign up for one [here](https://hub.docker.com/account/signup/). To avoid hard-coding credentials into the code the test suite leverages three Environment Variables: `DOCKER_API_USER`, `DOCKER_API_PASS`, and `DOCKER_API_EMAIL`. You will need to configure your work environment (shell profile, IDE, etc) with these values in order to successfully run certain tests.
 
 ```shell
 export DOCKER_API_USER='your_docker_hub_user'
 export DOCKER_API_PASS='your_docker_hub_password'
 export DOCKER_API_EMAIL='your_docker_hub_email_address'
 ```
-
-### `rake vcr:spec`
-This command will download the necessary Docker images and then run the Rspec tests while recording your VCR cassettes.
-
-### `rake vcr:unpack`
-This command will download the necessary Docker image.
-
-### `rake vcr:record`
-This is the command you will use to record a new set of VCR cassettes. This command runs the following procedures:
-1. Delete the existing `spec/vcr` directory.
-2. Launch a temporary local Docker registry
-3. Record new VCR cassettes by running the Rspec test suite against a live Docker daemon.

data/docker-api.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'vcr', '>= 2.7.0'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'webmock'
   # > 1.3.4 doesn't support ruby 1.9.2

data/lib/docker/image.rb

@@ -113,8 +113,12 @@ class Docker::Image
         :response_block => response_block(body, &block)
       )
       json = Docker::Util.fix_json(body)
-      image = json.reverse_each.find { |el| el && el.key?('id') }
-      new(conn, 'id' => image && image.fetch('id'), :headers => headers)
+      completions = json.compact.select { |j| j['status'] && j['status'].include?('complete') }
+      if image = completions.reverse_each.find { |j| j['id'] }
+        get(image['id'], {}, conn)
+      elsif image = opts['fromImage']
+        get(image, {}, conn)
+      end
     end
 
     # Return a specific image.

data/lib/docker/version.rb

@@ -1,6 +1,6 @@
 module Docker
   # The version of the docker-api gem.
-  VERSION = '1.23.0'
+  VERSION = '1.24.0'
 
   # The version of the compatible Docker remote API.
   API_VERSION = '1.16'

data/spec/docker/container_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-# WARNING if you're re-recording any of these VCRs, you must be running the
-# Docker daemon and have the base Image pulled.
 describe Docker::Container do
   describe '#to_s' do
     subject {
@@ -30,7 +28,7 @@ describe Docker::Container do
     let(:description) { subject.json }
     after(:each) { subject.remove }
 
-    it 'returns the description as a Hash', :vcr do
+    it 'returns the description as a Hash' do
       expect(description).to be_a Hash
       expect(description['Id']).to start_with(subject.id)
     end
@@ -49,16 +47,16 @@ describe Docker::Container do
 
     context 'when not selecting any stream' do
       let(:non_destination) { subject.streaming_logs }
-      it 'raises a client error', :vcr do
+      it 'raises a client error' do
         expect { non_destination }.to raise_error(Docker::Error::ClientError)
       end
     end
 
     context 'when selecting stdout' do
       let(:stdout) { subject.streaming_logs(stdout: 1) }
-      it 'returns blank logs', :vcr do
+      it 'returns blank logs' do
         expect(stdout).to be_a String
-        expect(stdout).to eq "hello\n"
+        expect(stdout).to match("hello")
       end
     end
 
@@ -66,19 +64,19 @@ describe Docker::Container do
       let(:options) { { 'Tty' => true } }
 
       let(:output) { subject.streaming_logs(stdout: 1, tty: 1) }
-      it 'returns `hello`', :vcr do
+      it 'returns `hello`' do
         expect(output).to be_a(String)
-        expect(output).to eq("hello\n")
+        expect(output).to match("hello")
       end
     end
 
     context 'when passing a block' do
       let(:lines) { [] }
       let(:output) { subject.streaming_logs(stdout: 1, follow: 1) { |s,c| lines << c } }
-      it 'returns `hello`', :vcr do
+      it 'returns `hello`' do
         expect(output).to be_a(String)
-        expect(output).to eq("hello\n")
-        expect(lines).to eq(["hello\n"])
+        expect(output).to match("hello")
+        expect(lines.join).to match("hello")
       end
     end
   end
@@ -91,14 +89,14 @@ describe Docker::Container do
 
     context "when not selecting any stream" do
       let(:non_destination) { subject.logs }
-      it 'raises a client error', :vcr do
+      it 'raises a client error' do
         expect { non_destination }.to raise_error(Docker::Error::ClientError)
       end
     end
 
     context "when selecting stdout" do
       let(:stdout) { subject.logs(stdout: 1) }
-      it 'returns blank logs', :vcr do
+      it 'returns blank logs' do
         expect(stdout).to be_a String
         expect(stdout).to eq ""
       end
@@ -117,8 +115,8 @@ describe Docker::Container do
       let(:opts) { {"name" => "bob"} }
       after(:each) { subject.remove }
 
-      it 'should have name set to bob', :vcr do
-        expect(subject.json["Name"]).to eq "/bob"
+      it 'should have name set to bob' do
+        expect(subject.json["Name"]).to eq("/bob")
       end
     end
   end
@@ -135,9 +133,9 @@ describe Docker::Container do
     before { subject.start }
     after(:each) { subject.kill!.remove }
 
-    it 'renames the container', :vcr do
+    it 'renames the container' do
       subject.rename('bar')
-      expect(subject.json["Name"]).to eq "bar"
+      expect(subject.json["Name"]).to eq("/bar")
     end
   end
 
@@ -153,7 +151,7 @@ describe Docker::Container do
     before { subject.tap(&:start).tap(&:wait) }
     after(:each) { subject.tap(&:wait).remove }
 
-    it 'returns the changes as an array', :vcr do
+    it 'returns the changes as an array' do
       expect(changes).to eq [
         {
           "Path" => "/root",
@@ -175,7 +173,7 @@ describe Docker::Container do
       image.remove
     end
 
-    it 'returns the top commands as an Array', :vcr do
+    it 'returns the top commands as an Array' do
       expect(top).to be_a Array
       expect(top).to_not be_empty
       expect(top.first.keys).to include('PID')
@@ -189,15 +187,14 @@ describe Docker::Container do
     after(:each) { subject.remove }
 
     context 'when the file does not exist' do
-      it 'raises an error', :vcr do
-        skip 'Docker no longer returns a 500 when the file does not exist'
-        # expect { subject.copy('/lol/not/a/real/file') { |chunk| puts chunk } }
-        #     .to raise_error
+      it 'raises an error' do
+        expect { subject.copy('/lol/not/a/real/file') { |chunk| puts chunk } }
+          .to raise_error
       end
     end
 
     context 'when the input is a file' do
-      it 'yields each chunk of the tarred file', :vcr do
+      it 'yields each chunk of the tarred file' do
         chunks = []
         subject.copy('/test') { |chunk| chunks << chunk }
         chunks = chunks.join("\n")
@@ -206,7 +203,7 @@ describe Docker::Container do
     end
 
     context 'when the input is a directory' do
-      it 'yields each chunk of the tarred directory', :vcr do
+      it 'yields each chunk of the tarred directory' do
         chunks = []
         subject.copy('/etc/logrotate.d') { |chunk| chunks << chunk }
         chunks = chunks.join("\n")
@@ -216,12 +213,12 @@ describe Docker::Container do
   end
 
   describe '#export' do
-    subject { described_class.create('Cmd' => %w[rm -rf / --no-preserve-root],
+    subject { described_class.create('Cmd' => %w[/true],
                                      'Image' => 'tianon/true') }
     before { subject.start }
     after { subject.tap(&:wait).remove }
 
-    it 'yields each chunk', :vcr do
+    it 'yields each chunk' do
       first = nil
       subject.export do |chunk|
         first ||= chunk
@@ -242,7 +239,7 @@ describe Docker::Container do
     after(:each) { subject.stop.remove }
 
     context 'with normal sized chunks' do
-      it 'yields each chunk', :vcr do
+      it 'yields each chunk' do
         chunk = nil
         subject.attach do |stream, c|
           chunk ||= c
@@ -260,7 +257,7 @@ describe Docker::Container do
         Docker.options = {}
       end
 
-      it 'yields each chunk', :vcr do
+      it 'yields each chunk' do
         chunk = nil
         subject.attach do |stream, c|
           chunk ||= c
@@ -271,11 +268,7 @@ describe Docker::Container do
   end
 
   describe '#attach with stdin' do
-    # Because this uses HTTP socket hijacking, it is not compatible with
-    # VCR, so it is currently pending until a good way to test it without
-    # a running Docker daemon is discovered
     it 'yields the output' do
-      skip 'HTTP socket hijacking not compatible with VCR'
       container = described_class.create(
         'Cmd'       => %w[cat],
         'Image'     => 'debian:wheezy',
@@ -283,9 +276,13 @@ describe Docker::Container do
         'StdinOnce' => true
       )
       chunk = nil
-      container.attach(stdin: StringIO.new("foo\nbar\n")) do |stream, c|
-        chunk ||= c
-      end
+      container
+        .tap(&:start)
+        .attach(stdin: StringIO.new("foo\nbar\n")) do |stream, c|
+          chunk ||= c
+        end
+      container.tap(&:wait).remove
+
       expect(chunk).to eq("foo\nbar\n")
     end
   end
@@ -298,12 +295,12 @@ describe Docker::Container do
         'Volumes' => {'/foo' => {}}
       )
     }
-    let(:all) { Docker::Container.all }
+    let(:all) { Docker::Container.all(all: true) }
 
     before { subject.start('Binds' => ["/tmp:/foo"]) }
     after(:each) { subject.remove }
 
-    it 'starts the container', :vcr do
+    it 'starts the container' do
       expect(all.map(&:id)).to be_any { |id| id.start_with?(subject.id) }
       expect(subject.wait(10)['StatusCode']).to be_zero
     end
@@ -317,7 +314,7 @@ describe Docker::Container do
     before { subject.tap(&:start).stop('timeout' => '10') }
     after { subject.remove }
 
-    it 'stops the container', :vcr do
+    it 'stops the container' do
       expect(described_class.all(:all => true).map(&:id)).to be_any { |id|
         id.start_with?(subject.id)
       }
@@ -339,22 +336,22 @@ describe Docker::Container do
     context 'when passed only a command' do
       let(:output) { subject.exec(['bash','-c','sleep 2; echo hello']) }
 
-      it 'returns the stdout/stderr messages and exit code', :vcr do
+      it 'returns the stdout/stderr messages and exit code' do
         expect(output).to eq([["hello\n"], [], 0])
       end
     end
 
     context 'when detach is true' do
-      let(:output) { subject.exec('date', detach: true) }
+      let(:output) { subject.exec(['date'], detach: true) }
 
-      it 'returns the Docker::Exec object', :vcr do
+      it 'returns the Docker::Exec object' do
         expect(output).to be_a Docker::Exec
         expect(output.id).to_not be_nil
       end
     end
 
     context 'when passed a block' do
-      it 'streams the stdout/stderr messages', :vcr do
+      it 'streams the stdout/stderr messages' do
         chunk = nil
         subject.exec(['bash','-c','sleep 2; echo hello']) do |stream, c|
           chunk ||= c
@@ -364,10 +361,9 @@ describe Docker::Container do
     end
 
     context 'when stdin object is passed' do
-      let(:output) { subject.exec('cat', stdin: StringIO.new("hello")) }
+      let(:output) { subject.exec(['cat'], stdin: StringIO.new("hello")) }
 
-      it 'returns the stdout/stderr messages', :vcr do
-        skip 'HTTP socket hijacking not compatible with VCR'
+      it 'returns the stdout/stderr messages' do
         expect(output).to eq([["hello"],[],0])
       end
     end
@@ -379,7 +375,7 @@ describe Docker::Container do
       ] }
       let(:output) { subject.exec(command, tty: true) }
 
-      it 'returns the raw stdout/stderr output', :vcr do
+      it 'returns the raw stdout/stderr output' do
         expect(output).to eq([["I'm a TTY!"], [], 0])
       end
     end
@@ -394,7 +390,7 @@ describe Docker::Container do
     before { subject.start }
     after(:each) {subject.remove }
 
-    it 'kills the container', :vcr do
+    it 'kills the container' do
       subject.kill
       expect(described_class.all.map(&:id)).to be_none { |id|
         id.start_with?(subject.id)
@@ -412,7 +408,7 @@ describe Docker::Container do
           'trap echo SIGTERM; while [ 1 ]; do echo hello; done'
         ]
       }
-      it 'kills the container', :vcr do
+      it 'kills the container' do
         subject.kill(:signal => "SIGTERM")
         expect(described_class.all.map(&:id)).to be_any { |id|
           id.start_with?(subject.id)
@@ -437,7 +433,7 @@ describe Docker::Container do
       described_class.create('Cmd' => ['ls'], 'Image' => 'debian:wheezy')
     }
 
-    it 'deletes the container', :vcr do
+    it 'deletes the container' do
       subject.delete(:force => true)
       expect(described_class.all.map(&:id)).to be_none { |id|
         id.start_with?(subject.id)
@@ -453,7 +449,7 @@ describe Docker::Container do
     before { subject.start }
     after { subject.kill!.remove }
 
-    it 'restarts the container', :vcr do
+    it 'restarts the container' do
       expect(described_class.all.map(&:id)).to be_any { |id|
         id.start_with?(subject.id)
       }
@@ -477,7 +473,7 @@ describe Docker::Container do
     }
     after { subject.unpause.kill!.remove }
 
-    it 'pauses the container', :vcr do
+    it 'pauses the container' do
       subject.pause
       expect(described_class.get(subject.id).info['State']['Paused']).to be true
     end
@@ -493,7 +489,7 @@ describe Docker::Container do
     before { subject.pause }
     after { subject.kill!.remove }
 
-    it 'unpauses the container', :vcr do
+    it 'unpauses the container' do
       subject.unpause
       expect(
         described_class.get(subject.id).info['State']['Paused']
@@ -512,7 +508,7 @@ describe Docker::Container do
     before { subject.start }
     after(:each) { subject.remove }
 
-    it 'waits for the command to finish', :vcr do
+    it 'waits for the command to finish' do
       expect(subject.wait['StatusCode']).to_not be_zero
     end
 
@@ -520,18 +516,16 @@ describe Docker::Container do
       subject { described_class.create('Cmd' => %w[sleep 5],
                                        'Image' => 'debian:wheezy') }
 
-      it 'sets the :read_timeout to that amount of time', :vcr do
+      it 'sets the :read_timeout to that amount of time' do
         expect(subject.wait(6)['StatusCode']).to be_zero
       end
 
-      # context 'and a command runs for too long' do
-      #   after(:each) { subject.remove }
-      #
-      #   it 'raises a ServerError', :vcr do
-      #     skip "VCR doesn't like to record errors"
-      #     expect{subject.wait(4)}.to raise_error(Docker::Error::TimeoutError)
-      #   end
-      # end
+      context 'and a command runs for too long' do
+        it 'raises a ServerError' do
+          expect{subject.wait(4)}.to raise_error(Docker::Error::TimeoutError)
+          subject.tap(&:wait)
+        end
+      end
     end
   end
 
@@ -546,7 +540,7 @@ describe Docker::Container do
         subject.remove
       end
 
-      it 'raises an error', :vcr do
+      it 'raises an error' do
         expect { run_command }
             .to raise_error(Docker::Error::UnexpectedResponseError)
       end
@@ -565,7 +559,7 @@ describe Docker::Container do
         end
       end
 
-      it 'creates a new container to run the specified command', :vcr do
+      it 'creates a new container to run the specified command' do
         expect(run_command.wait['StatusCode']).to be_zero
       end
     end
@@ -582,22 +576,23 @@ describe Docker::Container do
       image.remove
     end
 
-    it 'creates a new Image from the  Container\'s changes', :vcr do
+    it 'creates a new Image from the  Container\'s changes' do
       subject.tap(&:start).wait
 
       expect(image).to be_a Docker::Image
       expect(image.id).to_not be_nil
     end
 
-    # context 'if run is passed, it saves the command in the image', :vcr do
-    #   let(:image) { subject.commit }
-    #
-    #   it 'saves the command' do
-    #     skip 'This is no longer working in v0.8'
-    #     expect(image.run('pwd').attach).to eql [["/\n"],[]]
-    #   end
-    # end
+    context 'if run is passed, it saves the command in the image' do
+      let(:image) { subject.commit }
+      let(:container) { image.run('pwd') }
 
+      it 'saves the command' do
+        container.wait
+        expect(container.attach(logs: true, stream: false)).to eql [["/\n"],[]]
+        container.remove
+      end
+    end
   end
 
   describe '.create' do
@@ -622,29 +617,14 @@ describe Docker::Container do
       context 'when the HTTP request returns a 200' do
         let(:options) do
           {
-            "Hostname"     => "",
-            "User"         => "",
-            "Memory"       => 0,
-            "MemorySwap"   => 0,
-            "AttachStdin"  => false,
-            "AttachStdout" => false,
-            "AttachStderr" => false,
-            "PortSpecs"    => nil,
-            "Tty"          => false,
-            "OpenStdin"    => false,
-            "StdinOnce"    => false,
-            "Env"          => nil,
             "Cmd"          => ["date"],
-            "Dns"          => nil,
             "Image"        => "debian:wheezy",
-            "Volumes"      => {},
-            "VolumesFrom"  => ""
           }
         end
         let(:container) { subject.create(options) }
         after { container.remove }
 
-        it 'sets the id', :vcr do
+        it 'sets the id' do
           expect(container).to be_a Docker::Container
           expect(container.id).to_not be_nil
           expect(container.connection).to_not be_nil
@@ -678,7 +658,7 @@ describe Docker::Container do
       }
       after { container.remove }
 
-      it 'materializes the Container into a Docker::Container', :vcr do
+      it 'materializes the Container into a Docker::Container' do
         expect(subject.get(container.id)).to be_a Docker::Container
       end
     end
@@ -711,7 +691,7 @@ describe Docker::Container do
       before { container }
       after { container.remove }
 
-      it 'materializes each Container into a Docker::Container', :vcr do
+      it 'materializes each Container into a Docker::Container' do
         expect(subject.all(:all => true)).to be_all { |container|
           container.is_a?(Docker::Container)
         }