cnvrg 1.5.9.7 → 1.5.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cd8487e9d134f4a4540880ea609d2cec9502c232645d1488b5570f632da72da
-  data.tar.gz: 396ba0a587e23ea2abe7e521f3c785ea0eb6d020d8abd57efdf7fc07ff196538
+  metadata.gz: 80cea7cb72fe2519aa96ceea39d1ed127985dd7592b659608eceb5a8b459ff8c
+  data.tar.gz: 25614f2ff198c984c3aec669eff594b9319b652f2fd916f42198d7c5a6413791
 SHA512:
-  metadata.gz: 6f5bb69eb58019c3f3024825611f13bfcc369e22c278ef1d3bc20861db40cdb6842a5754e2d3d8feb47e9de8dad5a795a076b7fcc40297f70a038a825c6db8e0
-  data.tar.gz: ec6ef848299848cab9bab9f067bc45a441c2407d8f890a9c4ff32ae87f010e10f9c9f3068eff0775aa9e72cd3490e2c8733637d64342b4e0dd32688a9b7b2842
+  metadata.gz: a82a8d182742a92f0b3a3139c4bfbd766fd714bc487dc8b15077e6a5bef1e60d13888da783ece532613777a9b7b965e15728af4d0e32b27e1543d2ff46d6141d
+  data.tar.gz: 44ad16320b0e8ad5b6c768c011dcedc051e8c4f1faf0d9c62987cb09a8688f5fcf601cdab301aadf47eb4185a42547a502ddceb832fa8533635d007cd09c1d26

data/lib/cnvrg/image.rb

@@ -33,26 +33,37 @@ module Cnvrg
           file << open(image_data["docker_file_path"]).read
         end
       end
-      command = {:type=>"notify",
+      if ENV["CNVRG_IMAGE_BUILD_REGISTRY"].present?
+        docker_url = "#{ENV["CNVRG_IMAGE_BUILD_REGISTRY"]}/#{image_data["docker_name"]}"
+      else
+        docker_url = "#{image_data["docker_name"]}"
+      end
+        command = {:type=>"notify",
                    :title=>"docker build",
                    :logs=>true,
                   :before_execute_log=>"Building docker image",
                   :timeout=>3600,
-                   :command=>"sudo docker build . -t #{image_data["docker_name"]} -f #{file_name}"}
+                   :command=>"sudo docker build . -t #{docker_url} -f #{file_name}"}
       @executer = Helpers::Executer.new(project: @project, job_type: "image", job_id: @image_id, image: self)
       exit_status, output, errors, _, _ = @executer.execute(command)
       all_logs = join_logs(output, errors)
       if exit_status != 0
         raise StandardError.new(all_logs)
       end
-
       if ENV["CNVRG_IMAGE_BUILD_USERNAME"].present? and ENV["CNVRG_IMAGE_BUILD_PASSWORD"].present?
+        if ENV["CNVRG_IMAGE_BUILD_REGISTRY"].present?
         command = {:type=>"notify",
                     :no_stdout => true,
                     :title=>"docker login",
                     :logs=>true,
-
-                    :command=>"sudo docker login --username=#{ENV["CNVRG_IMAGE_BUILD_USERNAME"]} --password=\"#{ENV["CNVRG_IMAGE_BUILD_PASSWORD"]}\""}
+                    :command=>"sudo docker login #{ENV["CNVRG_IMAGE_BUILD_REGISTRY"]} --username=#{ENV["CNVRG_IMAGE_BUILD_USERNAME"]} --password=\"#{ENV["CNVRG_IMAGE_BUILD_PASSWORD"]}\""}
+        else
+          command = {:type=>"notify",
+                     :no_stdout => true,
+                     :title=>"docker login",
+                     :logs=>true,
+                     :command=>"sudo docker login --username=#{ENV["CNVRG_IMAGE_BUILD_USERNAME"]} --password=\"#{ENV["CNVRG_IMAGE_BUILD_PASSWORD"]}\""}
+          end
         exit_status, output, errors, _, _ = @executer.execute(command)
         all_logs = join_logs(output, errors)
         if exit_status != 0

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '1.5.9.7'
+  VERSION = '1.5.9.8'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.5.9.7
+  version: 1.5.9.8
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -448,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.