Merge pull request #13564 from eszense/rmi-patch

docker/provider: handle variation in error text during image removal

Author: allisonlarson

plugins/providers/docker/driver.rb

@@ -225,8 +225,9 @@ def rmi(id)
         execute('docker', 'rmi', id)
         return true
       rescue => e
-        return false if e.to_s.include?("is using it")
-        return false if e.to_s.include?("is being used")
+        return false if e.to_s.include?("is using it") or
+                        e.to_s.include?("is being used") or
+                        e.to_s.include?("is in use")
         raise if !e.to_s.include?("No such image")
       end
 

test/unit/plugins/providers/docker/driver_test.rb

@@ -579,6 +579,15 @@
         subject.rmi(id)
       end
     end
+
+    context 'image is in use by a container' do
+      before { allow(subject).to receive(:execute).and_raise("image is in use by a container") }
+
+      it 'does not remove the image' do
+        expect(subject.rmi(id)).to eq(false)
+        subject.rmi(id)
+      end
+    end
   end
 
   describe '#inspect_container' do