docker-remote 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cfe49856e12add82e0b4fa76a42381640b46ab0810a08db03cbd4e6619fa8d5
-  data.tar.gz: d5d7ab9eb55c7d2189ab5127e5b9c03a5e3c2c53a16241e540907cce3158fc72
+  metadata.gz: fa237c85cc84f1754b6cd4e22a62d8216a82ef07777d2b47d7b786769dc6e271
+  data.tar.gz: 0dc9ce6503cea3974e74783cfa612e11a094419e65c5dcbc7a202f2b51b10343
 SHA512:
-  metadata.gz: 046f4aa7357778f0ded105562fd8ec55e25dc4d012e1c9fcfd01ee4bda47670b26cb83a9fc1bb5f3b4ed625a248af8ea541effceb93e284984c1219baabe634e
-  data.tar.gz: 38cd75b59a2a12e2339fff98a492f97851d28068184dc7b354ef080f70a7e65baf09a5ffe6fc0495d64158e74d58e4826ceec90da75a2ca28535cbbb6d2a8ffd
+  metadata.gz: cb25048ceb8c1e7b1b567b7741fda86a7b8eebef80450b77f18d5b6ce32a4f2558d4c9ac36fbbde6ff7b6c4591a3ffd5e988859152906b65e96e82aaf17d1e1a
+  data.tar.gz: 48e4aa145fb981fbdf0a28719c476084f4d1028f90e663192c9ea663cc86fe6cb92d52fd6b2a5231a2c0d306670b30cf97af0559f1445ffec76bc32e326bf7d7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.5.0
+* Figure out registry port more accurately.
+
 ## 0.4.0
 * Support redirection when making HTTP requests.
 

data/lib/docker/remote/client.rb

@@ -13,6 +13,10 @@ module Docker
 
       attr_reader :registry_url, :repo, :username, :password
 
+      PORTMAP = { 'ghcr.io' => 443 }.freeze
+      DEFAULT_PORT = 443
+      STANDARD_PORTS = [DEFAULT_PORT, 80].freeze
+
       def initialize(registry_url, repo, username = nil, password = nil)
         @registry_url = registry_url
         @repo = repo
@@ -113,7 +117,27 @@ module Docker
       end
 
       def registry_uri
-        @registry_uri ||= URI.parse(registry_url)
+        @registry_uri ||= begin
+          host_port, *rest = registry_url.split('/')
+          host, port = host_port.split(':')
+
+          ports = if port
+            [port.to_i]
+          elsif prt = PORTMAP[host]
+            [prt]
+          else
+            STANDARD_PORTS
+          end
+
+          port = ports.find { |port| can_connect?(host, port) }
+
+          unless port
+            raise DockerRemoteError, "couldn't determine what port to connect to"
+          end
+
+          scheme = port == DEFAULT_PORT ? 'https' : 'http'
+          URI.parse("#{scheme}://#{host}:#{port}/#{rest.join('/')}")
+        end
       end
 
       def make_http(uri)
@@ -125,6 +149,49 @@ module Docker
       def registry_http
         @registry_http ||= make_http(registry_uri)
       end
+
+      # Adapted from: https://spin.atomicobject.com/2013/09/30/socket-connection-timeout-ruby/
+      def can_connect?(host, port)
+        # Convert the passed host into structures the non-blocking calls
+        # can deal with
+        addr = Socket.getaddrinfo(host, nil)
+        sockaddr = Socket.pack_sockaddr_in(port, addr[0][3])
+        timeout = 3
+
+        Socket.new(Socket.const_get(addr[0][0]), Socket::SOCK_STREAM, 0).tap do |socket|
+          socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+
+          begin
+            # Initiate the socket connection in the background. If it doesn't fail
+            # immediately it will raise an IO::WaitWritable (Errno::EINPROGRESS)
+            # indicating the connection is in progress.
+            socket.connect_nonblock(sockaddr)
+
+          rescue IO::WaitWritable
+            # IO.select will block until the socket is writable or the timeout
+            # is exceeded - whichever comes first.
+            if IO.select(nil, [socket], nil, timeout)
+              begin
+                # Verify there is now a good connection
+                socket.connect_nonblock(sockaddr)
+              rescue Errno::EISCONN
+                # Good news everybody, the socket is connected!
+                socket.close
+                return true
+              rescue
+                # An unexpected exception was raised - the connection is no good.
+                socket.close
+              end
+            else
+              # IO.select returns nil when the socket is not ready before timeout
+              # seconds have elapsed
+              socket.close
+            end
+          end
+        end
+
+        false
+      end
     end
   end
 end

data/lib/docker/remote/version.rb

@@ -1,5 +1,5 @@
 module Docker
   module Remote
-    VERSION = '0.4.0'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-remote
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby client for communicating with the Docker registry API v2.
 email: