docker-template 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c619f82805d6347fc614a212828d5bcb1b185783171a771c2720c9f277c175a
-  data.tar.gz: d1dc93f95b9f840b82e5d4d29017d7b681660a1f3921626d128f140508676c21
+  metadata.gz: deedf46a1eaad06ea4d15d5b8aaa64e18bed91ac1fe60e24ddb7ed2e1a007326
+  data.tar.gz: a8d61651f99f6cb7796003a615d0ad03f75bc0f29a0eb33d1c47a322b244d1cf
 SHA512:
-  metadata.gz: 10fa2829cfb98fb41a19dfbd92ef71926024c4e0e3bee74d2950823e7cd397e8fcca4728d56e0b1bec89a37b1a2951f573329ebe513646d267c290d5d0e01570
-  data.tar.gz: 97c360cb05d1356f81189bc226228fb57d0f16e946f84b886c16b8e6dec78d410253a39289d03a29511ff10e89adbdb3a67bffaa2e786610ee1497d9a77e964a
+  metadata.gz: bfca0f56abefaf977c4afb325e1b372de5a73392063f53b7a5d8244263b7bbdfe1c09ba2faa7d76f21811e4ec70f336478ea78db2d3e6dc45e990dc57481ffc4
+  data.tar.gz: 56234609946129e0de47d3dd7607d1b38e4efaab8313e7da31d168ae9ee42da3699276bfbe4bf7446c6ca4fd9fb1c116e64dce0898807e6616c328ac2a40e157

data/lib/docker/template/auth.rb

@@ -2,16 +2,20 @@
 # Copyright: 2015 - 2016 Jordon Bedwell - Apache v2.0 License
 # Encoding: utf-8
 
+require "open3"
+require "json"
+
 module Docker
   module Template
-    module Auth
-      module_function
-
-      # --
-
+    class Auth
       DEFAULT_SERVER = "https://index.docker.io/v1/"
+      def initialize(repo)
+        @repo = repo
+      end
 
-      # --
+      def auth_with_cmd?
+        @repo.user =~ %r!/!
+      end
 
       def auth_with_env?
         ENV.key?("DOCKER_USERNAME") && \
@@ -20,17 +24,29 @@ module Docker
       end
 
       # --
-
-      def hub
-        return auth_from_env if auth_with_env?
-
+      def auth(skip: nil)
+        return auth_from_cmd if auth_with_cmd? && skip != :cmd
+        return auth_from_env if auth_with_env? && skip != :env
         auth_from_config
+
+      # Wrap around their error to create ours.
       rescue Docker::Error::AuthenticationError
         raise Error::UnsuccessfulAuth
+        # Something went wrong?
       end
 
       # --
+      def auth_from_cmd
+        case @repo.user
+        when %r!^gcr\.io/! then auth_from_gcr
+        else
+          auth({
+            skip: :cmd
+          })
+        end
+      end
 
+      # --
       def auth_from_env
         Docker.authenticate!({
           "username" => ENV["DOCKER_USERNAME"],
@@ -41,25 +57,43 @@ module Docker
       end
 
       # --
-
       def auth_from_config
-        credentials = Pathutil.new("~/.docker/config.json")
-        credentials = credentials.expand_path.read_json
+        cred = Pathutil.new("~/.docker/config.json")
+        cred = cred.expand_path.read_json
 
-        unless credentials.empty?
-          credentials["auths"].each do |server, info|
-            username, password = Base64.decode64(info["auth"])
-              .split(":", 2)
+        unless cred.empty?
+          cred["auths"].each do |server, info|
+            next if info.empty?
 
+            user, pass = Base64.decode64(info["auth"]).split(":", 2)
             Docker.authenticate!({
-              "username" => username,
+              "username" => user,
               "serveraddress" => server,
               "email" => info["email"],
-              "password" => password
+              "password" => pass
             })
           end
         end
       end
+
+      private
+      def auth_from_gcr
+        i, o, e, = Open3.popen3("docker-credential-gcr get")
+        server, = @repo.user.split("/", 2)
+
+        i.puts server; i.close
+        val = JSON.parse(o.read.chomp)
+        [o, e].map(&:close)
+
+        if val
+          Docker.authenticate!({
+            "serveraddress" => server,
+            "username" => val["Username"],
+            "email" => "docker-template+opensource@envygeeks.io",
+            "password" => val["Secret"],
+          })
+        end
+      end
     end
   end
 end

data/lib/docker/template/builder.rb

@@ -81,7 +81,8 @@ module Docker
       def push
         return if rootfs? || !@repo.pushable?
 
-        Notify.push(self); Auth.hub
+        Notify.push(self)
+        Auth.new(@repo).auth
         img = @img || Image.get(@repo.to_s)
         img.push nil, :repo_tag => @repo.to_s, \
           &Logger.new(repo).method(:api)

data/lib/docker/template/version.rb

@@ -4,6 +4,6 @@
 
 module Docker
   module Template
-    VERSION = "0.20.0"
+    VERSION = "0.21.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-template
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Jordon Bedwell