linecook-gem 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b1bfd465b9a947d4dc9327697ac2119c926cf6d
-  data.tar.gz: 099a8215f93a65f3de819039dec6e0c44a7234e6
+  metadata.gz: 5e78c53c1e83145109b3ab202160bf5c4faec69f
+  data.tar.gz: 5a1b403b3f344fe357d5dec040c095c2545e5f9f
 SHA512:
-  metadata.gz: b20b96b0d98fb5f6079e0c4742d0d0a28e4969072148ddfede37219b0313bcd98f503d54342473991dd5411a716ff38e2522e92aa5ea9d29bc4dfc7e1251fc96
-  data.tar.gz: 1447f5a54dddf2bf44fa4a838afbda701efe9335472f0bf8293a6fa0abb36ae1b184548336af047f55beb4f9f0c12aad05d29f8679fd42acd3863d3588eb8559
+  metadata.gz: 55302b7abbc4388af5abd732b49d1c76b6ef168621bfe6b32dd3de3bc52f906c9f8264f6c5618a773ada7f1bdb5d8a1ddd67372251a05d545268438706f49cb8
+  data.tar.gz: 880e4a9b214a59b5b39ec8bd871c9bf6c87f3734aacee5cad896b3b6abcf68ec5de3ce0c4ecf0b759a0d88f8f0452e35aebfb690e7aaac47ee137122ce4cc41d

data/lib/linecook-gem/baker/docker.rb

@@ -73,17 +73,27 @@ module Linecook
       def clean_older_images(image)
         puts "Cleaning up older images for #{image.group}..."
         older_images(image).each do |old|
-          id = old.info['RepoTags'].first
-          puts "Removing #{id}"
-          begin
-            old.remove(force: true)
-          rescue ::Docker::Error::ConflictError => e
-            puts "Failed to remove #{id}"
-            puts e.message
+          children(old).each do |child|
+            remove_docker_image(child)
           end
+          remove_docker_image(old)
         end
       end
 
+      def remove_docker_image(docker_image)
+        puts "Removing #{docker_image.id}"
+        docker_image.remove(force: false)
+      rescue ::Docker::Error::ConflictError => e
+        puts "Failed to remove #{docker_image.id}"
+        puts e.message
+      end
+
+      def children(parent_image)
+        ::Docker::Image.all.select do |docker_image|
+          docker_image.info['ParentId'] == parent_image.id
+        end.compact
+      end
+
       def older_images(image)
         ::Docker::Image.all.select do |docker_image|
           group, tag = docker_image.info['RepoTags'].first.split(':')

data/lib/linecook-gem/version.rb

@@ -1,3 +1,3 @@
 module Linecook
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: linecook-gem
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Dale Hamel