phoebo 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c98ff805f2a0d711330de92f980f47f3dd73aad1
-  data.tar.gz: 13a361ff06bb6ff9cf7e7e303e39f2d35a9637ad
+  metadata.gz: b02687c6a02c73020be2cbb439df797f779e094c
+  data.tar.gz: eb92a5b4e00451eaebe0bdf6807d36e9a5bbdf3a
 SHA512:
-  metadata.gz: 77cb733064268a0cb83b4300b1c5debe7a6fafb2fa23fa8b6d9160f49835fd135d06c3d7a7c0e0072c233dcfa31630cb0f901e9ea2da3464b21199db8d5bd60f
-  data.tar.gz: 2453756005d675bed1a927181e9010b1e7c430a93d558d175a4d59e56601b539e58063ec279e08b6380ae14896ccc07ac1af2c99823be970a691c39818e9079e
+  metadata.gz: e4ce79487f72c76dcc1920e20738d325d9f8b17ec6c2c052b54fe3ff7bf4b2e11edebbd4f330a18a4d23962287904ee3ab491db0328ebb7767b0c5d4f89af5c9
+  data.tar.gz: c9526f19ab92696fa0ef22eebf881bc38f49a12b7f9f1d15a98aa7cb7219ced1921696efbeb9265626ac9b952a2cb8bf6245d6089d2fa105b458e622aca19f01

data/lib/phoebo/config.rb

@@ -49,12 +49,6 @@ module Phoebo
             raise Phoebo::SyntaxError.new("You need to define image for #{id}.")
           end
         end
-
-        if @request.ref
-          unless task[:image] =~ /:[^:]+$/i
-            task[:image] += ":#{@request.ref.downcase}"
-          end
-        end
       end
 
       self

data/lib/phoebo/config/image.rb

@@ -7,6 +7,8 @@ module Phoebo
         @actions = []
         @name = name
 
+        raise Phoebo::SyntaxError.new('Invalid image name.') if name.include?(':')
+
         if options.is_a?(Hash)
 
           # image('my-image', from: 'base-image')

data/lib/phoebo/docker/image_builder.rb

@@ -49,9 +49,19 @@ module Phoebo
           stdout.print " virtual size: " + ('%.2f MB' % (built_image.json['VirtualSize'].to_f / 1000 / 1000)).cyan
           stdout.puts
 
-          tag = @request.ref ? @request.ref[0...8] : 'latest'
+          if @request.ref
+            if @request.ref =~ /^[0-9a-f]+$/i
+              tag = @request.ref[0...8]
+            else
+              tag = @request.ref
+            end
+          else
+            tag = 'latest'
+          end
+
           stdout.puts "Tagging image #{built_image.id.to_s.cyan} -> #{image.name.cyan}#{':'.cyan}#{tag.cyan}"
           built_image.tag('repo' => image.name, 'tag' => tag, 'force' => true)
+          image.name += ":#{tag}"
 
           # Return image ID
           built_image.id

data/lib/phoebo/version.rb

@@ -1,3 +1,3 @@
 module Phoebo
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phoebo
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Adam Staněk