Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

require 'bundler/setup'

ENV['PATH'] = "/opt/docker/:#{ENV['PATH']}" if ENV['CI'] == 'true'

require 'docker'
require 'rspec/core/rake_task'

Expand All @@ -16,7 +14,7 @@ end

desc 'Download the necessary base images'
task :unpack do
%w( swipely/base registry busybox:uclibc tianon/true debian:stable ).each do |image|
%w( hello-world registry busybox:uclibc debian:stable ).each do |image|
system "docker pull #{image}"
end
end
Expand Down
4 changes: 2 additions & 2 deletions TESTING.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Prerequisites
To develop on this gem, you must the following installed:
* a sane Ruby 1.9+ environment with `bundler`
* a Ruby 2.4+ environment with `bundler`
```shell
$ gem install bundler
```
* Docker v1.3.1 or greater
* a currently supported Docker Engine release (or Podman)



Expand Down
149 changes: 0 additions & 149 deletions script/docker

This file was deleted.

61 changes: 0 additions & 61 deletions script/docker.conf

This file was deleted.

4 changes: 2 additions & 2 deletions spec/docker/container_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@
end

describe '#export' do
subject { described_class.create('Cmd' => %w[/true],
'Image' => 'tianon/true') }
subject { described_class.create('Cmd' => %w[/hello],
'Image' => 'hello-world') }
before { subject.start }
after { subject.tap(&:wait).remove }

Expand Down
16 changes: 8 additions & 8 deletions spec/docker/image_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
}
let(:repo_tag) { "#{ENV['DOCKER_API_USER']}/true" }
let(:image) {
described_class.build("FROM tianon/true\n", "t" => repo_tag).refresh!
described_class.build("FROM hello-world\n", "t" => repo_tag).refresh!
}
after { image.remove(:name => repo_tag, :noprune => true) }

Expand All @@ -199,7 +199,7 @@

context 'when the image was retrived by get' do
let(:image) {
described_class.build("FROM tianon/true\n", "t" => repo_tag).refresh!
described_class.build("FROM hello-world\n", "t" => repo_tag).refresh!
described_class.get(repo_tag)
}

Expand Down Expand Up @@ -296,7 +296,7 @@
let(:cmd) { nil }

context 'no command configured in image' do
subject { described_class.create('fromImage' => 'swipely/base') }
subject { described_class.create('fromImage' => 'hello-world') }
xit 'should raise an error if no command is specified' do
begin
container
Expand Down Expand Up @@ -398,7 +398,7 @@
subject { described_class }

context 'when the Image does not yet exist and the body is a Hash' do
let(:image) { subject.create('fromImage' => 'swipely/base') }
let(:image) { subject.create('fromImage' => 'hello-world') }
let(:creds) {
{
:username => ENV['DOCKER_API_USER'],
Expand All @@ -409,9 +409,9 @@

before do
skip_without_auth
Docker::Image.create('fromImage' => 'swipely/base').remove
Docker::Image.create('fromImage' => 'hello-world').remove
end
after { Docker::Image.create('fromImage' => 'swipely/base') }
after { Docker::Image.create('fromImage' => 'hello-world') }

it 'sets the id and sends Docker.creds' do
allow(Docker).to receive(:creds).and_return(creds)
Expand Down Expand Up @@ -520,15 +520,15 @@
after { FileUtils.remove(file) }

it 'exports tarball of image to specified file' do
Docker::Image.save('swipely/base', file)
Docker::Image.save('hello-world', file)
expect(File.exist?(file)).to eq true
expect(File.read(file)).to_not be_nil
end
end

context 'when no filename is specified' do
it 'returns raw binary data as string' do
raw = Docker::Image.save('swipely/base')
raw = Docker::Image.save('hello-world')
expect(raw).to_not be_nil
end
end
Expand Down
Loading