dapp 0.36.16 → 0.36.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da20ef360f362d60ebda4ae5d5618b5b965e106402e128b7b07c450251e4ef37
-  data.tar.gz: 57a1b2f2b7737c312550e7fe121ece4a7a93fd70544e505a4345aa126a9a3ac4
+  metadata.gz: 031c115e5fd2071be28fff8ea8e9bf515f647ee0199bc1835185d5a48a2f1c05
+  data.tar.gz: 24807d3bceeb1a42267e8f7fa6296209ff52c7ddf28598260bc11f5f3c56096c
 SHA512:
-  metadata.gz: a043b66f7cc69032140d132072d2e882a368ae95b73ee8023d52522dc181b9e02953afad37ded7058a371366ae326abbc7074c9a401907b09c651870d6916538
-  data.tar.gz: 6373435134a5a58cc4d18bca4df6d5079a2adab3389e2a0d6ff71b5db942b516291b327049b268d9f5f4d3babbf3cacd1dfa950eb787f40493fc9e888765ea70
+  metadata.gz: 858754b5ae7a36adaea7ecf33c4fe377c7eb690897b8f436fa18bbd42e8179f8c95a860bd5659e44ff2e5fb63a5f7205d1ef0a8bb5661a611c18aae4783ee0f3
+  data.tar.gz: 66dd586ab30917543c29bdc150e65a5a4bde106f4e120045e6b1685f215146ce29485a6c15556adab9c53ebc9fe7464d5f511e07574976975bd5ca41f3011ee4

data/lib/dapp/dimg/dapp/command/cleanup_repo.rb

@@ -74,59 +74,65 @@ module Dapp
           # pod items[] spec containers[] image
           def pod_images(client)
             client.pod_list['items'].map do |item|
-              item['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item)
             end
           end
 
           # cronjob items[] spec jobTemplate spec template spec containers[] image
           def cronjob_images(client)
             client.cronjob_list['items'].map do |item|
-              item['spec']['jobTemplate']['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['jobTemplate']['spec']['template'])
             end
           end
 
           # daemonsets   items[] spec template spec containers[] image
           def daemonset_images(client)
             client.daemonset_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
           # deployment   items[] spec template spec containers[] image
           def deployment_images(client)
             client.deployment_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
           # job          items[] spec template spec containers[] image
           def job_images(client)
             client.job_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
           # replicasets  items[] spec template spec containers[] image
           def replicaset_images(client)
             client.replicaset_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
            # replicasets  items[] spec template spec containers[] image
            def statefulset_images(client)
             client.statefulset_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
           # replicationcontroller    items[] spec template spec containers[] image
           def replicationcontroller_images(client)
             client.replicationcontroller_list['items'].map do |item|
-              item['spec']['template']['spec']['containers'].map{ |cont| cont['image'] }
+              images_from_pod_spec(item['spec']['template'])
             end
           end
 
+          def images_from_pod_spec(pod_spec)
+            containers = Array(pod_spec['spec']['containers'])
+            initContainers = Array(pod_spec['spec']['initContainers'])
+            (containers + initContainers).map { |cont| cont['image'] }
+          end
+
           def without_kube?
             !!options[:without_kube]
           end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.36.16"
+  VERSION = "0.36.17"
   BUILD_CACHE_VERSION = 33
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.36.16
+  version: 0.36.17
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -743,7 +743,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Build docker packaged apps using chef or shell