minke 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzJkZDljZjI0N2MwMWE3OWIyZjJiYTA1ZDljNTE3NzE2ZTAwOGRlNg==
+    OGQ3MTA3Mjk1YTJkNzM2ZmI1Mjc0ZTEyZDc4YzAyZDI4Yjk3NjRmNg==
   data.tar.gz: !binary |-
-    MGU4ZmViYjI3NTU2ZTlmMjA0N2VkODVkNzlkMzdmYzJhMzc3ZDk0Yw==
+    MDZlMjVjNzQyNWRiYjhiM2FkODBjNzg3NDVlZjcyMmU2Y2ZiZDBkNA==
 SHA512:
   metadata.gz: !binary |-
-    ZjNkNzQwYmU2NTUxOWI3ODllOWY3YTgzMDUzNmY4Mjg1OTg1NjhmMzU4N2Rj
-    MDFiZThhYmUzODJiM2I3MWM1YjY4NDU5YWE1MTg2Yjg1Y2JiNmJjNTRkMmQx
-    YjA1MzY0MDA5Y2NiZGRhMDhiNzcyNjE4ZTE4NDNmMDg1ZTgzYjg=
+    ZTliNWJiYzllNjBjOGVmNWJhZWQ0MDQ0N2ZiNzlhYzhkN2MyNzFmYTdlMzU2
+    N2ZjZjk4N2I4YmFlMGYyOTVlY2ZjZDE1YTQ1ZjcxNzU1YmZkZTg3ZGVhOWRi
+    NzhhNTYyYjVlMWQ4NGNlNWE3OGYxMGJkNWMyMGMxMzdiMjZiZTI=
   data.tar.gz: !binary |-
-    MjE1MDIwMzVjOTE4ODgzY2U2MWU2OThhYTE5ZGIxN2U5YzVlMDYwODFkMmRm
-    MzY1ZmZlY2U5YjQ3N2Q5ZjFhYjVkMjkzYWIwZWY5N2RkMDgzYmI4YTNlOGQ4
-    NWQ1NmNjYzE5YmJhZWZkMThjNWVkZjZkYmY2M2E2ZDM2NDZkNzY=
+    ZDBiOTdkNTYzMGJmODBmMzM2Zjc2ZWQyZDIyNDg1MjVkMDJjNmEzNTA3ZWU5
+    ZTI0ODMyNGU5ZDMxYzY0ZDVkYmRiOGZjNDFhZjc0NDExNzdkNTI5MzU4YzEy
+    MzYwYTBkZWRiZmEzZGRkZDAyOTEzMWE4ZDRlN2Q4MThiODJjMzM=

data/lib/minke/docker/docker_runner.rb

@@ -107,7 +107,12 @@ module Minke
       end
 
       def login_registry url, user, password, email
-        system("docker login -u #{user} -p #{password} #{url}")
+        if docker_version.start_with? '1.11'
+          # email is removed for login in docker 1.11
+          system("docker login -u #{user} -p #{password} #{url}")
+        else
+          system("docker login -u #{user} -p #{password} -e #{email} #{url}")
+        end
         $?.exitstatus
       end
 
@@ -120,6 +125,10 @@ module Minke
       	system("docker push #{image_name}:latest")
         $?.exitstatus ==  0
       end
+
+      def docker_version
+        ::Docker.version['Version']
+      end
     end
   end
 end

data/lib/minke/version.rb

@@ -1,3 +1,3 @@
 module Minke
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minke
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Nic Jackson