Permalink
Browse files

Fix specinfra version

  • Loading branch information...
1 parent b9018a5 commit c950d13f731b7eb8c7493bb883ff31f890d7d867 @ngs committed Sep 25, 2015
Showing with 7 additions and 17 deletions.
  1. +1 −0 docker/serverspec/Gemfile
  2. +6 −9 docker/serverspec/Gemfile.lock
  3. +0 −8 docker/serverspec/spec/spec_helper.rb
@@ -1,6 +1,7 @@
source 'https://rubygems.org'
gem 'rspec'
+gem 'specinfra', '2.12.7'
gem 'serverspec'
gem 'docker-api'
gem 'rspec_junit_formatter', git: 'git@github.com:circleci/rspec_junit_formatter.git'
@@ -20,8 +20,7 @@ GEM
multi_json (1.11.2)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
- net-ssh (2.9.2)
- net-telnet (0.1.1)
+ net-ssh (3.0.1)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
@@ -38,17 +37,14 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
- serverspec (2.24.1)
+ serverspec (2.8.2)
multi_json
rspec (~> 3.0)
rspec-its
- specinfra (~> 2.43)
- sfl (2.2)
- specinfra (2.43.8)
+ specinfra (~> 2.12)
+ specinfra (2.12.7)
net-scp
- net-ssh (~> 2.7)
- net-telnet
- sfl
+ net-ssh
PLATFORMS
ruby
@@ -58,6 +54,7 @@ DEPENDENCIES
rspec
rspec_junit_formatter!
serverspec
+ specinfra (= 2.12.7)
BUNDLED WITH
1.10.6
@@ -17,18 +17,10 @@
if ENV['CIRCLECI']
module Docker
class Container
- def exec(command, opts = {}, &block)
- command[2] = command[2].inspect
- cmd = %Q{sudo lxc-attach -n #{self.id} -- #{command.join(' ')}}
- stdin, stdout, stderr, wait_thread = Open3.popen3 cmd
- [stdout.read, [stderr.read], wait_thread.value.exitstatus]
- end
-
def remove(options={})
# do not delete container
end
alias_method :delete, :remove
- alias_method :kill, :remove
end
end
end

0 comments on commit c950d13

Please sign in to comment.