lib/minke/docker/docker_runner.rb in minke-1.1.0 vs lib/minke/docker/docker_runner.rb in minke-1.2.0

@@ -105,11 +105,16 @@
           end
         end
       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
 
       def tag_image image_name, tag
         image =  self.find_image "#{image_name}:latest"
@@ -117,9 +122,13 @@
       end
 
       def push_image image_name
       	system("docker push #{image_name}:latest")
         $?.exitstatus ==  0
+      end
+
+      def docker_version
+        ::Docker.version['Version']
       end
     end
   end
 end