vidar 1.9.1 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e26a3d84c5de4e7c506b028409ce6ee47dbac922a9365239cd62c7d2595552c6
-  data.tar.gz: 7b9643a791b05bca66fc51299e35690079554dd6e5c3b96dd91385011d60cc90
+  metadata.gz: 1c7daa1e068c23277c471c47d2876c9557b00baef603235d893564ed43f1d7f9
+  data.tar.gz: 3b08484e8f10902153ece3615660c5c5c1edfe25452a4cdaaaf72db5f0145191
 SHA512:
-  metadata.gz: 44f848eecb1498f52370cbcdda0d96d4d9345c4a1363ab7abba5366e0cdf322d220cef9f4759dddc56d79ad5d455638f2412cc75855db79f0537f11534239503
-  data.tar.gz: 600233a334a4bdd395bf9b573085a1a03f02007cae5903e93fd31c645d874ae35f0ddef8b179214c82edee243ab1b109cc3f6403ae473fd15253e1e9fcac421f
+  metadata.gz: a51ce45925f510602e9b23f9192cc269f4ab7064bc8afc2d6de92d3c5d9162a19b5dec35eaefecff1309738ad6600ce9945dbdfa096306fb4df9444446ef1934
+  data.tar.gz: e53d39ba5bf7f473438123fa3147dd00d8b1c9711dd125fbbe1d2c17f9da7a5a5ef6ecf8152618f6355a101d9ccde6f7f37cd7b3afb57b205c8ef19db3e524ee

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.9.2 - 2023-12-11
+
+Improves and simplifies how docker layers are cached and used. Adds `build_and_cache_base` command.
+
 ## 1.8.0 - 2023-06-02
 
 Add support for HTTPS_PROXY automatically set for each kubectl command

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.9.1)
+    vidar (1.9.3)
       colorize
       faraday
       thor (~> 1.0)
@@ -54,7 +54,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.58.0)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)

data/lib/vidar/cli.rb

@@ -22,9 +22,11 @@ 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!(:current_branch)} 2> /dev/null || true"
-      unless Config.default_branch?
+      if Config.default_branch?
+        Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}} 2> /dev/null || true"
         Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:default_branch)} 2> /dev/null || true"
+      else
+        Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)} 2> /dev/null || true"
       end
       Log.info "Docker images:"
       Run.docker("images")

data/lib/vidar/config.rb

@@ -6,7 +6,7 @@ module Vidar
     DEFAULT_OPTIONS = {
       compose_file:       -> { "docker-compose.ci.yml" },
       default_branch:     -> { (DEFAULT_BRANCHES & branches).first || DEFAULT_BRANCHES.first },
-      current_branch:     -> { ENV['SEMAPHORE_GIT_WORKING_BRANCH'] || `git rev-parse --abbrev-ref HEAD`.strip.tr("/", "-") },
+      current_branch:     -> { (ENV['SEMAPHORE_GIT_WORKING_BRANCH'] || `git rev-parse --abbrev-ref HEAD`.strip).tr("/", "-") },
       revision:           -> { `git rev-parse HEAD`.strip },
       revision_name:      -> { `git show --pretty=format:"%s (%h)" -s HEAD`.strip },
       kubectl_context:    -> { `kubectl config current-context`.strip },

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.9.1'.freeze
+  VERSION = '1.9.3'.freeze
 end

metadata

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