vidar 1.13.3 → 1.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7d8910395a160c21a621c94f84d423c6dfb3f07e1d1e55e9090560227c975e
-  data.tar.gz: 8a2d04f5b4e54d233d409c0ec3a1dfce9a9defc359adf7e6a245e011da6a80ff
+  metadata.gz: 5c96a6938608186988d95fbfc35484c3277591ada026983b454bf18f371edc69
+  data.tar.gz: e6505546c3a9609c0b2443d469460f2f36194679d4b906601b9dab5c2ded4eca
 SHA512:
-  metadata.gz: 0446c72a4fe47092ee10a5702f61f96b5a20c6c388a78485e2973d23cfd824846475c7bf61f56a656d37dab82c1899be04242414a0843f6ab60c08deba2314b8
-  data.tar.gz: 52b388455b4bc91ab972fe94fbe00a516de48b305236f4a23d7e6d17b7eb46dd5af09da0976101606d27059210cb5de58e190c40c8ef2dc0aa672d0d7e4f708b
+  metadata.gz: 9d0659e94c7c009057d0d752f79eb1fadc1fc993e4de0f9b24975d77771f0192efafe9ea1a7def905178d7027c3a42b1eb0e60ef708c0583a45e3fc4e5c0c1e6
+  data.tar.gz: d0a1042e63335f76e87b61b6a899d9df704d35fe34aec8f0494bc9b571672c50b2724f4881b442e534b9207ec8123c4279fa1df03febe02316c980898849a0ae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.13.3)
+    vidar (1.13.4)
       colorize
       faraday
       thor (~> 1.0)

data/lib/vidar/cli.rb

@@ -22,12 +22,14 @@ module Vidar
     desc "pull", "Pull existing docker images to leverage docker caching"
     def pull
       Log.info "Pulling #{Config.get!(:image)} tags"
-      Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:default_branch)} 2> /dev/null || true"
-      unless Config.default_branch?
-        Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)} 2> /dev/null || true"
-      end
+      Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)} 2> /dev/null || true"
+
+      docker_images = `docker images --format "{{.Repository}}:{{.Tag}}"`.split("\n")
+      base_image = "#{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:default_branch)}"
+      Run.docker "pull #{base_image} 2> /dev/null || true" unless docker_images.include?(base_image)
+
       Log.info "Docker images:"
-      Run.docker("images")
+      Log.info docker_images.join("\n")
     end
 
     desc "build_and_cache_base", "Build and caches base stage"

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.13.3'.freeze
+  VERSION = '1.13.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.13.4
 platform: ruby
 authors:
 - Krzysztof Knapik