dctl_rb 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3ae83ed9a27583eb0a2b019dd4d0930c4a9fd8e318520bcdcbe71f9d8690f2f
-  data.tar.gz: 63b5f032b93c54d125ee3a798e9cdeb3ea9a10ccea5799949cab193751b6fc6d
+  metadata.gz: 68f259d4d14228322b0da58bec4b4a2d47a71c4479fae91c3a00522c0117ec1b
+  data.tar.gz: d60f4c417658802a8e44c882f50ad6daab5dcc1d76e2514f32451c35ebce7c17
 SHA512:
-  metadata.gz: 8f64d03907aea231b974712e265ae1037e686812c11976a6ebaffdecb38d4479cf858698fb3000d2309aa03cd882d41c58a67b23c64092bd4d1f381091370b2a
-  data.tar.gz: 46166eb3231a78a77876b8475c7be916126b9c02b6b3491a2536ba2ebf4f5bf15390ad57fd0102695ca3157452d33258f13d347c6d418b4d0ce082a97010f1f4
+  metadata.gz: fb0bcc8ab1aa3e616c2684215d99c4c893ada9d4db9f16c75bce8aa5449e996d959590e095d6aec10439c7811192c211b3f5b4bfe944ff358a7b814f2e1e7ebc
+  data.tar.gz: 1938e201c5c9655fe66258486bbd87b9d9cc5282e5c317176275d9cb02b416c7dea9bc18ba135539638ec779ab616041857679e4cdfa242be081b639e30a6fba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dctl_rb (0.10.0)
+    dctl_rb (0.10.1)
       config (>= 1, < 2)
       rainbow (>= 2.2, < 3)
       rake (~> 12)

data/exe/dctl

@@ -17,9 +17,19 @@ module Dctl
     class_option :host, type: :string
 
     desc "build", "Build images. Pass image name to build a specific one; otherwise builds all"
-    option :pull, type: :boolean, default: false
+    option :pull, type: :boolean, desc: "Pull before building (same as docker build --pull)"
     option :cache_from, type: :string
+    option :cache_from_self, type: :boolean, desc: "Uses the tag being built " \
+      "as the cache source. Useful for rebuilding images where the cache is " \
+      "not available (e.g. CI)"
     def build(*images)
+      if options[:cache_from] && options[:cache_from_self]
+        error = "--cache-from and --cache-from-self are mutually exclusive: " \
+          "Please specify only one at a time."
+        puts Rainbow(error).fg ERROR_COLOR
+        exit 1
+      end
+
       dctl   = Dctl::Main.new env: options[:env]
       images = dctl.expand_images *images
       env    = options[:env]
@@ -27,15 +37,13 @@ module Dctl
       puts "Generating build script for #{images.join(", ")}"
       commands = []
 
-
       images.each do |image|
         tag = dctl.image_tag(image)
         dockerfile = dctl.image_dockerfile(image)
-        build_opts = %W(
-          -f=#{dockerfile}
-          -t=#{tag}
-        )
+
+        build_opts = %W(-f=#{dockerfile} -t=#{tag})
         build_opts << "--pull=true" if options[:pull]
+        build_opts << "--cache-from=#{tag}" if options[:cache_from_self]
         if options[:cache_from]
           if images.size > 1
             error = "--cache-from is only supported when building a single " \

data/lib/dctl/version.rb

@@ -1,3 +1,3 @@
 module Dctl
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dctl_rb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Justin Toniazzo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler