dapp 0.10.2 → 0.36.24

data/lib/dapp/dimg/docker_registry/base.rb

@@ -2,106 +2,63 @@ module Dapp
   module Dimg
     module DockerRegistry
       class Base
-        include Request
-        include Authorization
+        attr_accessor :dapp
+        attr_accessor :repository
 
-        API_VERSION = 'v2'.freeze
-
-        attr_accessor :repo
-        attr_accessor :hostname_url
-        attr_accessor :repo_suffix
-
-        def initialize(repo, hostname_url, repo_suffix)
-          self.repo = repo
-          self.hostname_url = hostname_url
-          self.repo_suffix = repo_suffix
-        end
-
-        def repo_exist?
-          tags.any?
-        end
-
-        def tags
-          @tags ||= api_request(repo_suffix, 'tags/list')['tags'] || []
-        rescue Error::Registry => e
-          raise Exception::Registry, code: :no_such_dimg, data: { registry: api_url } if e.net_status[:code] == :page_not_found
-          raise
+        def initialize(dapp, repository)
+          self.dapp = dapp
+          self.repository = repository
         end
 
         def image_id(tag)
-          response = manifest_v2(tag)
-          response['config']['digest'] if response['schemaVersion'] == 2
+          ruby2go_docker_registry_command(command: :image_id, options: { reference: tag_reference(tag) })
         end
 
         def image_parent_id(tag)
-          image_history(tag)['container_config']['Image']
-        end
-
-        def image_labels(tag)
-          image_history(tag)['config']['Labels']
-        end
-
-        def image_delete(tag)
-          image_blobs(tag).each { |hash| blob_delete(hash.values.first) }
-          api_request(repo_suffix, "/manifests/#{image_digest(tag)}",
-                      method: :delete,
-                      expects: [202, 404],
-                      headers: { Accept: 'Accept: application/vnd.docker.distribution.manifest.v2+json' })
-        end
-
-        def image_history(tag)
-          response = manifest_v1(tag)
-          JSON.load(response['history'].first['v1Compatibility'])
+          ruby2go_docker_registry_command(command: :image_parent_id, options: { reference: tag_reference(tag) })
         end
 
-        protected
-
-        def image_digest(tag)
-          raw_api_request(repo_suffix, "/manifests/#{tag}",
-                          headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' }).headers['Docker-Content-Digest']
+        def image_config(tag)
+          ruby2go_docker_registry_command(command: :image_config, options: { reference: tag_reference(tag) })
         end
 
-        def image_blobs(tag)
-          manifest_v1(tag)['fsLayers']
+        def gcr_image_delete(tag)
+          image_delete_by_tag(tag)
         end
 
-        def manifest_v1(tag)
-          api_request(repo_suffix, "/manifests/#{tag}")
+        def image_delete(tag)
+          digest = image_digest(tag)
+          image_delete_by_digest(digest)
         end
 
-        def manifest_v2(tag)
-          api_request(repo_suffix, "/manifests/#{tag}",
-                      headers: { Accept: 'application/vnd.docker.distribution.manifest.v2+json' })
+        def image_delete_by_tag(tag)
+          ruby2go_docker_registry_command(command: :image_delete, options: { reference: tag_reference(tag) })
         end
 
-        def blob_delete(id)
-          api_request(repo_suffix, "/blobs/#{id}",
-                      method: :delete, expects: [202, 404])
+        def image_delete_by_digest(digest)
+          ruby2go_docker_registry_command(command: :image_delete, options: { reference: digest_reference(digest) })
         end
 
-        def api_request(*uri, **options)
-          JSON.load(raw_api_request(*uri, **options).body)
+        def image_digest(tag)
+          ruby2go_docker_registry_command(command: :image_digest, options: { reference: tag_reference(tag) })
         end
 
-        def raw_api_request(*uri, **options)
-          url = api_url(*uri)
-          request(url, **default_api_options.merge(options))
-        rescue Excon::Error::NotFound
-          raise Error::Registry, code: :page_not_found, data: { url: url, registry: api_url }
-        rescue Excon::Error::Unauthorized
-          user_not_authorized!
-        end
+        protected
 
-        def api_url(*uri)
-          File.join(hostname_url, API_VERSION, '/', *uri)
+        def tag_reference(tag = nil)
+          [self.repository.chomp("/"), tag].compact.join(":")
         end
 
-        def default_api_options
-          { expects: [200] }
+        def digest_reference(digest = nil)
+          [self.repository.chomp("/"), digest].compact.join("@")
         end
 
-        def user_not_authorized!
-          raise Error::Registry, code: :user_not_authorized, data: { registry: api_url }
+        def ruby2go_docker_registry_command(command:, **options)
+          (options[:options] ||= {}).merge!(host_docker_config_dir: dapp.class.host_docker_config_dir)
+          dapp.ruby2go_docker_registry(command: command, **options).tap do |res|
+            raise Error::Registry, code: :ruby2go_docker_registry_command_failed_unexpected_error, data: { command: command, message: res["error"] } unless res["error"].nil?
+            break res['data']
+          end
         end
       end
     end # DockerRegistry

data/lib/dapp/dimg/docker_registry/dimg.rb

@@ -0,0 +1,55 @@
+module Dapp
+  module Dimg
+    module DockerRegistry
+      class Dimg < Base
+        def dimgstages_tags
+          ruby2go_docker_registry_command(command: :dimgstage_tags, options: { reference: tag_reference })
+        end
+
+        def dimg_tags(dimg_name)
+          with_dimg_repository(dimg_name.to_s) do
+            ruby2go_docker_registry_command(command: :dimg_tags, options: { reference: tag_reference })
+          end
+        end
+
+        def nameless_dimg_tags
+          ruby2go_docker_registry_command(command: :dimg_tags, options: { reference: tag_reference })
+        end
+
+        def image_id(tag, dimg_repository = nil)
+          with_dimg_repository(dimg_repository.to_s) { super(tag) }
+        end
+
+        def image_parent_id(tag, dimg_repository = nil)
+          with_dimg_repository(dimg_repository.to_s) { super(tag) }
+        end
+
+        def image_config(tag, dimg_repository = nil)
+          with_dimg_repository(dimg_repository.to_s) { super(tag) }
+        end
+
+        def gcr_image_delete(tag, dimg_repository = nil)
+          with_dimg_repository(dimg_repository.to_s) { super(tag) }
+        end
+
+        def image_delete(tag, dimg_repository = nil)
+          with_dimg_repository(dimg_repository.to_s) { super(tag) }
+        end
+
+        def image_digest(tag, dimg_repository = nil)
+          with_dimg_repository(dimg_repository.to_s) { super(tag) }
+        end
+
+        protected
+
+        def with_dimg_repository(dimg_repository)
+          old_repository = repository
+          @repository    = File.join(old_repository, dimg_repository)
+          yield
+        ensure
+          @repository = old_repository
+        end
+      end
+    end # DockerRegistry
+  end # Dimg
+end # Dapp

data/lib/dapp/dimg/docker_registry.rb

@@ -1,37 +1,19 @@
 module Dapp
   module Dimg
     module DockerRegistry
-      def self.new(repo)
-        /^#{repo_name_format}$/ =~ repo
-        expected_hostname = Regexp.last_match(:hostname)
-        expected_repo_suffix = Regexp.last_match(:repo_suffix)
-        expected_hostname_url = expected_hostname ? "http://#{expected_hostname}" : nil
-
-        if hostname_exist?(expected_hostname_url)
-          Base.new(repo, expected_hostname_url, expected_repo_suffix)
-        else
-          Default.new(repo, File.join(*[expected_hostname, expected_repo_suffix].compact))
-        end
+      def self.new(dapp, repo)
+        Dimg.new(dapp, repo)
       end
 
       def self.repo_name_format
-        separator = '[_.]|__|[-]*'
-        alpha_numeric = '[[:alnum:]]*'
-        component = "#{alpha_numeric}[#{separator}#{alpha_numeric}]*"
-        port_number = '[[:digit:]]+'
-        hostcomponent = '[[:alnum:]_-]*[[:alnum:]]'
-        hostname = "#{hostcomponent}[\\.#{hostcomponent}]*(?<port>:#{port_number})?"
-        "(?<hostname>#{hostname}/)?(?<repo_suffix>#{component}[/#{component}]*)"
+        rpart = '[a-z0-9]+(([_.]|__|-+)[a-z0-9]+)*'
+        hpart = '(?!-)[a-z0-9-]+(?<!-)'
+        "(?<hostname>#{hpart}(\\.#{hpart})*(?<port>:[0-9]+)?\/)?(?<repo_suffix>#{rpart}(\/#{rpart})*)"
       end
 
       def self.repo_name?(name)
         !(/^#{repo_name_format}$/ =~ name).nil?
       end
-
-      def self.hostname_exist?(url)
-        return false unless url
-        Base.url_available?(url)
-      end
     end # DockerRegistry
   end # Dimg
 end # Dapp

data/lib/dapp/dimg/error/build.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Build < Base; end
+      class Build < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/chef.rb

@@ -1,11 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Chef < Base
-        def initialize(**net_status)
-          super(context: 'chef', **net_status)
-        end
-      end
+      class Chef < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/{command.rb → default.rb}

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Command < Base; end
+      class Default < ::Dapp::Error::Default; end
     end
   end
 end

data/lib/dapp/dimg/error/dimg.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Dimg < Base; end
+      class Dimg < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/lock.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Lock < Base; end
+      class Lock < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/registry.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Registry < Base; end
+      class Registry < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/rugged.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class Rugged < Base; end
+      class Rugged < Default; end
     end
   end
 end

data/lib/dapp/dimg/error/tar_writer.rb

@@ -1,7 +1,7 @@
 module Dapp
   module Dimg
     module Error
-      class TarWriter < Base; end
+      class TarWriter < Default; end
     end
   end
 end