kuby-core 0.11.10 → 0.11.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0828619de266c13d61f0eafc6ce902d1500e07af158337439eba6f45415594c3'
-  data.tar.gz: e296dc5858fe83e8eb9626d674a8c79a0e033559b168ee414d6afbf2f37f5b9e
+  metadata.gz: 78bc9ff66849f7b55046753a84be77fd64af68d28c1746245a463f5f240d0e9e
+  data.tar.gz: '079e0ccccc1ae12a18a2cb459e7a6b1f2b3ef05149d5bf347fed5ba1e6abbb2b'
 SHA512:
-  metadata.gz: d215cfb16bdd4e784500c1c22364bdd086cf059c38a9696626ffc774158e803b9f72337de4eda09719b26d505c83e1bba533e8e49acc1dddd1304b27f3558d2b
-  data.tar.gz: 6002bd6ee7a7cdd4d2568658fb8bdf8a9d8f42a19fa51ec846ceef5f35b458e9550d80e38aad168e2ce35e15bc91256570df160f1fec6d9cf763de362528ac04
+  metadata.gz: f27a9bd4698e6cdcb4c0308c91a78e5c86ac6eccd6dcd8f9ff1b28a73e8c1aa50f79512dc9ad3b5fdb43c024ba5054c1df1844bd74473c5bd9dd3c3cf034c7c4
+  data.tar.gz: fca6952c0bfe4cb5d2e6e9b0f4f50d46483bb43ad32d601dbdfcc14eeccb4070706043e786d18ade2730b9521443f55fb317620334f212fb88cfb92ab8672cb1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.11.11
+* Add support for a Docker registry running on localhost.
+  - Correctly parse and handle URLs with specific ports.
+  - Only perform a Docker login if a username is provided.
+
 ## 0.11.10
 * Fix spelling in error message.
 

data/lib/kuby/docker/metadata.rb

@@ -40,7 +40,8 @@ module Kuby
 
       sig { returns(String) }
       def image_host
-        @image_host ||= "#{full_image_uri.scheme}://#{full_image_uri.host}"
+        uri = full_image_uri
+        @image_host ||= "#{uri.scheme}://#{uri.host}:#{uri.port}"
       end
 
       sig { returns(String) }
@@ -74,7 +75,7 @@ module Kuby
       def full_image_uri
         @full_image_uri ||= if image_url.include?('://')
           URI.parse(image_url)
-        elsif image_url =~ /\A[^.]+\.[^\/]+\//
+        elsif image_url =~ /\A[^.:]+[\.:][^\/]+\//
           URI.parse("#{DEFAULT_REGISTRY_SCHEME}://#{image_url}")
         else
           URI.parse("#{DEFAULT_REGISTRY_HOST}/#{image_url.sub(/\A[\/]+/, '')}")

data/lib/kuby/tasks.rb

@@ -43,7 +43,7 @@ module Kuby
 
       hostname = docker.metadata.image_hostname
 
-      unless docker.cli.auths.include?(hostname)
+      if docker.credentials.username && !docker.cli.auths.include?(hostname)
         Kuby.logger.info("Attempting to log in to registry at #{hostname}")
 
         begin

data/lib/kuby/version.rb

@@ -1,5 +1,5 @@
 # typed: true
 
 module Kuby
-  VERSION = '0.11.10'.freeze
+  VERSION = '0.11.11'.freeze
 end

data/spec/docker/metadata_spec.rb

@@ -19,18 +19,18 @@ describe Kuby::Docker::Metadata do
   describe '#image_host' do
     subject { metadata.image_host }
 
-    it { is_expected.to eq(described_class::DEFAULT_REGISTRY_HOST) }
+    it { is_expected.to eq("#{described_class::DEFAULT_REGISTRY_HOST}:443") }
 
     context 'when the image URL contains an explicit host' do
       let(:docker_image_url) { 'registry.foo.com/foo/testapp' }
 
-      it { is_expected.to eq('https://registry.foo.com') }
+      it { is_expected.to eq('https://registry.foo.com:443') }
     end
 
     context 'when the image URL contains an explicit host with scheme' do
       let(:docker_image_url) { 'http://registry.foo.com/foo/testapp' }
 
-      it { is_expected.to eq('http://registry.foo.com') }
+      it { is_expected.to eq('http://registry.foo.com:80') }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-core
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.11
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize