phoebo 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b02687c6a02c73020be2cbb439df797f779e094c
-  data.tar.gz: eb92a5b4e00451eaebe0bdf6807d36e9a5bbdf3a
+  metadata.gz: aaaf647c7943ab6ee828ac42aa52d8e1af4153b8
+  data.tar.gz: 0deba1bc5f55d3886520551295d9de3389a3692b
 SHA512:
-  metadata.gz: e4ce79487f72c76dcc1920e20738d325d9f8b17ec6c2c052b54fe3ff7bf4b2e11edebbd4f330a18a4d23962287904ee3ab491db0328ebb7767b0c5d4f89af5c9
-  data.tar.gz: c9526f19ab92696fa0ef22eebf881bc38f49a12b7f9f1d15a98aa7cb7219ced1921696efbeb9265626ac9b952a2cb8bf6245d6089d2fa105b458e622aca19f01
+  metadata.gz: 868e904c086951ff65bb8d610ab8e35542ccd260d3e13f5b60491e9069a1522fff28b223068a5aa12e30f6a3aa0c662614fc6ce4fb8614976c6616fffb7ebc4f
+  data.tar.gz: 1f0050f8d930f9a89dc47afc0f6dd0ad1213c7da2cc6da0fb849a25331dc9e20987ff54e5a422bfda93a9c245c17412abf080b25a1955d08697eb0006e8a0ec3

data/lib/phoebo/config.rb

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

data/lib/phoebo/config/image.rb

@@ -59,6 +59,18 @@ module Phoebo
         end
       end
 
+      # Create image tag from ref
+      def self.tag(ref)
+        if ref
+          if ref =~ /^[0-9a-f]+$/i
+            return ref[0...8].downcase
+          else
+            return ref
+          end
+        else
+          return 'latest'
+        end
+      end
     end
   end
 end

data/lib/phoebo/docker/image_builder.rb

@@ -8,12 +8,11 @@ module Phoebo
     class ImageBuilder
       include Console
 
-      def initialize(base_path, request)
+      def initialize(base_path)
         @base_path = Pathname.new(base_path)
-        @request = request
       end
 
-      def build(image)
+      def build(image, tag)
         project_files = { }
         dockerfile = []
 
@@ -49,19 +48,8 @@ module Phoebo
           stdout.print " virtual size: " + ('%.2f MB' % (built_image.json['VirtualSize'].to_f / 1000 / 1000)).cyan
           stdout.puts
 
-          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.4"
+  VERSION = "0.3.5"
 end

data/lib/phoebo/worker.rb

@@ -23,9 +23,9 @@ module Phoebo
         config = Config.new_from_file(config_path, @request)
 
         # Build & push image
-        builder = Docker::ImageBuilder.new(path, @request)
+        builder = Docker::ImageBuilder.new(path)
         config.images.each do |image|
-          image_id = builder.build(image)
+          image_id = builder.build(image, Config::Image.tag(@request.ref))
           pusher.push(image_id) if @request.docker_user
         end
 

data/spec/phoebo/docker/image_builder_spec.rb

@@ -40,6 +40,6 @@ describe Phoebo::Docker::ImageBuilder do
 
   it 'processes commands' do
     expect(Docker::Image).to receive(:build_from_tar).and_return(docker_image)
-    subject.build(image)
+    subject.build(image, 'latest')
   end
 end

metadata

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