From 6a247f6bde80ff0ef52643904d910b496e8d21f2 Mon Sep 17 00:00:00 2001
From: Tom Duffield <tom@chef.io>
Date: Fri, 30 Jan 2015 14:47:55 -0600
Subject: [PATCH] Replace outdated testcontainerd

bflad's testcontainerd wasn't working with newer versions of Docker.
This commit replaces that container with one from tduffields' repo.
---
 README.md                                                   | 4 ++--
 test/cookbooks/docker_test/CHANGELOG.md                     | 2 +-
 .../files/default/tests/minitest/container_lwrp_test.rb     | 6 +++---
 .../files/default/tests/minitest/image_lwrp_test.rb         | 4 ++--
 test/cookbooks/docker_test/recipes/container_lwrp.rb        | 2 +-
 test/cookbooks/docker_test/recipes/image_lwrp.rb            | 2 +-
 test/shared/spec/container_spec.rb                          | 2 +-
 test/shared/spec/image_spec.rb                              | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 7ae3c67f58..9f8f1b99ab 100644
--- a/README.md
+++ b/README.md
@@ -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
 ```
diff --git a/test/cookbooks/docker_test/CHANGELOG.md b/test/cookbooks/docker_test/CHANGELOG.md
index 28f8cbf371..a08038c178 100644
--- a/test/cookbooks/docker_test/CHANGELOG.md
+++ b/test/cookbooks/docker_test/CHANGELOG.md
@@ -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:
 
diff --git a/test/cookbooks/docker_test/files/default/tests/minitest/container_lwrp_test.rb b/test/cookbooks/docker_test/files/default/tests/minitest/container_lwrp_test.rb
index e8c4a745c7..87aafab239 100644
--- a/test/cookbooks/docker_test/files/default/tests/minitest/container_lwrp_test.rb
+++ b/test/cookbooks/docker_test/files/default/tests/minitest/container_lwrp_test.rb
@@ -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
 
diff --git a/test/cookbooks/docker_test/files/default/tests/minitest/image_lwrp_test.rb b/test/cookbooks/docker_test/files/default/tests/minitest/image_lwrp_test.rb
index 5adae0b28f..f8f9b85012 100644
--- a/test/cookbooks/docker_test/files/default/tests/minitest/image_lwrp_test.rb
+++ b/test/cookbooks/docker_test/files/default/tests/minitest/image_lwrp_test.rb
@@ -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
diff --git a/test/cookbooks/docker_test/recipes/container_lwrp.rb b/test/cookbooks/docker_test/recipes/container_lwrp.rb
index cb64d21fe5..1205bebc2d 100644
--- a/test/cookbooks/docker_test/recipes/container_lwrp.rb
+++ b/test/cookbooks/docker_test/recipes/container_lwrp.rb
@@ -72,7 +72,7 @@
   action :create
 end
 
-docker_container 'bflad/testcontainerd' do
+docker_container 'tduffield/testcontainerd' do
   detach true
   port '9999:9999'
 end
diff --git a/test/cookbooks/docker_test/recipes/image_lwrp.rb b/test/cookbooks/docker_test/recipes/image_lwrp.rb
index cfa08cd20a..eaad161c4f 100644
--- a/test/cookbooks/docker_test/recipes/image_lwrp.rb
+++ b/test/cookbooks/docker_test/recipes/image_lwrp.rb
@@ -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
diff --git a/test/shared/spec/container_spec.rb b/test/shared/spec/container_spec.rb
index 59b30effe1..6b67bab0c0 100644
--- a/test/shared/spec/container_spec.rb
+++ b/test/shared/spec/container_spec.rb
@@ -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
diff --git a/test/shared/spec/image_spec.rb b/test/shared/spec/image_spec.rb
index 82518a7532..4ac4fb2e2e 100644
--- a/test/shared/spec/image_spec.rb
+++ b/test/shared/spec/image_spec.rb
@@ -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