Skip to content

Commit

Permalink
Merge pull request #267 from bflad/update_testcontainerd_image
Browse files Browse the repository at this point in the history
Replace outdated testcontainerd
  • Loading branch information
Tom Duffield committed Jan 30, 2015
2 parents c0f2110 + 6a247f6 commit 5c5cac2
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -662,10 +662,10 @@ Conditionally rebuild image if changes upstream:
```ruby
git "#{Chef::Config[:file_cache_path]}/docker-testcontainerd" do
repository 'git@github.com:bflad/docker-testcontainerd.git'
notifies :build, 'docker_image[bflad/testcontainerd]', :immediately
notifies :build, 'docker_image[tduffield/testcontainerd]', :immediately
end

docker_image 'bflad/testcontainerd' do
docker_image 'tduffield/testcontainerd' do
action :pull_if_missing
end
```
Expand Down
2 changes: 1 addition & 1 deletion test/cookbooks/docker_test/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This file is used to list changes made in each version of docker_test.

* Bugfix: Remove deprecated public_port in container_lwrp
* Bugfix: Add `init_type false` for busybox test containers
* Enhancement: Add bflad/testcontainerd image, container, and tests
* Enhancement: Add tduffield/testcontainerd image, container, and tests

## 0.3.0:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
service('busybox').wont_be_running
end

it 'has bflad/testcontainerd container running' do
assert container_exists?('bflad/testcontainerd')
assert container_running?('bflad/testcontainerd')
it 'has tduffield/testcontainerd container running' do
assert container_exists?('tduffield/testcontainerd')
assert container_running?('tduffield/testcontainerd')
service('testcontainerd').must_be_running
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
assert image_exists?('busybox')
end

it 'has bflad/testcontainerd image installed' do
assert image_exists?('bflad/testcontainerd')
it 'has tduffield/testcontainerd image installed' do
assert image_exists?('tduffield/testcontainerd')
end

it 'has docker_image_build_1 image not installed' do
Expand Down
2 changes: 1 addition & 1 deletion test/cookbooks/docker_test/recipes/container_lwrp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
action :create
end

docker_container 'bflad/testcontainerd' do
docker_container 'tduffield/testcontainerd' do
detach true
port '9999:9999'
end
Expand Down
2 changes: 1 addition & 1 deletion test/cookbooks/docker_test/recipes/image_lwrp.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
docker_image 'docker-test-image'

docker_image 'busybox'
docker_image 'bflad/testcontainerd'
docker_image 'tduffield/testcontainerd'

docker_image 'docker-test-image' do
action :remove
Expand Down
2 changes: 1 addition & 1 deletion test/shared/spec/container_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
it { should_not be_running }
end

describe docker_container('bflad/testcontainerd') do
describe docker_container('tduffield/testcontainerd') do
it { should be_a_container }
it { should be_running }
end
Expand Down
2 changes: 1 addition & 1 deletion test/shared/spec/image_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
it { should be_a_image }
end

describe docker_imag('bflad/testcontainerd') do
describe docker_imag('tduffield/testcontainerd') do
it { should be_a_image }
end

Expand Down

0 comments on commit 5c5cac2

Please sign in to comment.