docker-api 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c8d229ece5b5b347a925c62c3f199a940393e58de0b02049aed295090739b04
-  data.tar.gz: 619467ed3697f6b9221f89bab145ba298bd47f5f26209e86df89347b6e83fe08
+  metadata.gz: fc1628fd247f468eade6265726036edfe62cf330a3f0be35f24359af395dc4b4
+  data.tar.gz: 29a503b4ac556125534508256dbea71f6acc1a3612b24c1ae204cbd93a83ba04
 SHA512:
-  metadata.gz: 7a1a3a2a995c4a172217fc80eb573501502f7f05a337080bf4723d90bb2ba9053cde786aaa994993bd2841ebeeb18cc8a5e4dfa342792bb558fb84a3f4688b89
-  data.tar.gz: c9bbb7ae229ba1784859ddb0e3bc6e7df1651718d552779baac4e2ad49d34096aba760e6ce99fa41dfd14ef6ea0f3a5ddfc9178cf1c7c7f286a8385be1c59385
+  metadata.gz: 0e0478393e9624e3b206c4578a1a2449843da15bcbceb70520a708ce4a9e8a493a13dd5c6d0e8d3b2b71e1256a4770eb3cb1568471985fd3f52fb703e03ac20e
+  data.tar.gz: 14022d379e3e2dade67ffcd6ce12e56f9e12b65eb00e1906e579561262963fde36181b955526bfbd24c47baba3b4dfee15475c980e7f5bda4bff64ecf8e36859

data/README.md

@@ -34,6 +34,8 @@ Usage
 
 docker-api is designed to be very lightweight. Almost no state is cached (aside from id's which are immutable) to ensure that each method call's information is up to date. As such, just about every external method represents an API call.
 
+At this time, basic `podman` support has been added via the podman docker-compatible API socket.
+
 ## Starting up
 
 Follow the [installation instructions](https://docs.docker.com/install/), and then run:
@@ -76,8 +78,6 @@ irb(main):004:0> Docker.options
 => {}
 ```
 
-Before doing anything else, ensure you have the correct version of the Docker API. To do this, run `Docker.validate_version!`. If your installed version is not supported, a `Docker::Error::VersionError` is raised.
-
 ### SSL
 
 When running docker using SSL, setting the DOCKER_CERT_PATH will configure docker-api to use SSL.

data/lib/docker/connection.rb

@@ -1,6 +1,9 @@
 # This class represents a Connection to a Docker server. The Connection is
 # immutable in that once the url and options is set they cannot be changed.
 class Docker::Connection
+  require 'docker/util'
+  require 'docker/error'
+
   include Docker::Error
 
   attr_reader :url, :options
@@ -35,21 +38,58 @@ class Docker::Connection
 
   # Send a request to the server with the `
   def request(*args, &block)
+    retries ||= 0
     request = compile_request_params(*args, &block)
     log_request(request)
-    resource.request(request).body
-  rescue Excon::Errors::BadRequest => ex
-    raise ClientError, ex.response.body
-  rescue Excon::Errors::Unauthorized => ex
-    raise UnauthorizedError, ex.response.body
-  rescue Excon::Errors::NotFound => ex
-    raise NotFoundError, ex.response.body
-  rescue Excon::Errors::Conflict => ex
-    raise ConflictError, ex.response.body
-  rescue Excon::Errors::InternalServerError => ex
-    raise ServerError, ex.response.body
-  rescue Excon::Errors::Timeout => ex
-    raise TimeoutError, ex.message
+    begin
+      resource.request(request).body
+    rescue Excon::Errors::BadRequest => ex
+      if retries < 2
+        response_cause = ''
+        begin
+          response_cause = JSON.parse(ex.response.body)['cause']
+        rescue JSON::ParserError
+          #noop
+        end
+
+        if response_cause.is_a?(String)
+          # The error message will tell the application type given and then the
+          # application type that the message should be
+          #
+          # This is not perfect since it relies on processing a message that
+          # could change in the future. However, it should be a good stop-gap
+          # until all methods are updated to pass in the appropriate content
+          # type.
+          #
+          # A current example message is:
+          #   * 'Content-Type: application/json is not supported. Should be "application/x-tar"'
+          matches = response_cause.delete('"\'').scan(%r{(application/\S+)})
+          unless matches.count < 2
+            Docker.logger.warn(
+              <<~RETRY_WARNING
+              Automatically retrying with content type '#{response_cause}'
+                Original Error: #{ex}
+              RETRY_WARNING
+            ) if Docker.logger
+
+            request[:headers]['Content-Type'] = matches.last.first
+            retries += 1
+            retry
+          end
+        end
+      end
+      raise ClientError, ex.response.body
+    rescue Excon::Errors::Unauthorized => ex
+      raise UnauthorizedError, ex.response.body
+    rescue Excon::Errors::NotFound => ex
+      raise NotFoundError, ex.response.body
+    rescue Excon::Errors::Conflict => ex
+      raise ConflictError, ex.response.body
+    rescue Excon::Errors::InternalServerError => ex
+      raise ServerError, ex.response.body
+    rescue Excon::Errors::Timeout => ex
+      raise TimeoutError, ex.message
+    end
   end
 
   def log_request(request)
@@ -60,13 +100,38 @@ class Docker::Connection
     end
   end
 
+  def to_s
+    "Docker::Connection { :url => #{url}, :options => #{options} }"
+  end
+
   # Delegate all HTTP methods to the #request.
   [:get, :put, :post, :delete].each do |method|
     define_method(method) { |*args, &block| request(method, *args, &block) }
   end
 
-  def to_s
-    "Docker::Connection { :url => #{url}, :options => #{options} }"
+  # Common attribute requests
+  def info
+    Docker::Util.parse_json(get('/info'))
+  end
+
+  def ping
+    get('/_ping')
+  end
+
+  def podman?
+    @podman ||= !(
+      Array(version['Components']).find do |component|
+        component['Name'].include?('Podman')
+      end
+    ).nil?
+  end
+
+  def rootless?
+    @rootless ||= (info['Rootless'] == true)
+  end
+
+  def version
+    @version ||= Docker::Util.parse_json(get('/version'))
   end
 
 private

data/lib/docker/exec.rb

@@ -19,6 +19,13 @@ class Docker::Exec
   # @return [Docker::Exec] self
   def self.create(options = {}, conn = Docker.connection)
     container = options.delete('Container')
+
+    # Podman does not attach these by default but does require them to be attached
+    if ::Docker.podman?(conn)
+      options['AttachStderr'] = true if options['AttachStderr'].nil?
+      options['AttachStdout'] = true if options['AttachStdout'].nil?
+    end
+
     resp = conn.post("/containers/#{container}/exec", {},
       body: MultiJson.dump(options))
     hash = Docker::Util.parse_json(resp) || {}

data/lib/docker/image.rb

@@ -65,7 +65,16 @@ class Docker::Image
 
   # Remove the Image from the server.
   def remove(opts = {})
-    name = opts.delete(:name) || self.id
+    name = opts.delete(:name)
+
+    unless name
+      if ::Docker.podman?
+        name = self.id.split(':').last
+      else
+        name = self.id
+      end
+    end
+
     connection.delete("/images/#{name}", opts)
   end
   alias_method :delete, :remove
@@ -227,7 +236,16 @@ class Docker::Image
     # Import an Image from the output of Docker::Container#export. The first
     # argument may either be a File or URI.
     def import(imp, opts = {}, conn = Docker.connection)
-      open(imp) do |io|
+      require 'open-uri'
+
+      # This differs after Ruby 2.4
+      if URI.public_methods.include?(:open)
+        munged_open = URI.method(:open)
+      else
+        munged_open = self.method(:open)
+      end
+
+      munged_open.call(imp) do |io|
         import_stream(opts, conn) do
           io.read(Excon.defaults[:chunk_size]).to_s
         end

data/lib/docker/util.rb

@@ -1,8 +1,10 @@
+require 'set'
+
 # This module holds shared logic that doesn't really belong anywhere else in the
 # gem.
 module Docker::Util
   # http://www.tldp.org/LDP/GNU-Linux-Tools-Summary/html/x11655.htm#STANDARD-WILDCARDS
-  GLOB_WILDCARDS = /[\?\*\[\{]/
+  GLOB_WILDCARDS = /[\?\*\[\{\]\}]/
 
   include Docker::Error
 
@@ -142,10 +144,35 @@ module Docker::Util
     File.new(tempfile.path, 'r')
   end
 
+
+  # return the set of files that form the docker context
+  # implement this logic https://docs.docker.com/engine/reference/builder/#dockerignore-file
+  def docker_context(directory)
+    all_files = glob_all_files(File.join(directory, "**/*"))
+    dockerignore = File.join(directory, '.dockerignore')
+    return all_files unless all_files.include?(dockerignore)
+
+    # Iterate over valid lines, starting with the initial glob as working set
+    File
+      .read(dockerignore)                # https://docs.docker.com/engine/reference/builder/#dockerignore-file
+      .each_line                         # "a newline-separated list of patterns"
+      .map(&:strip)                      # "A preprocessing step removes leading and trailing whitespace"
+      .reject(&:empty?)                  # "Lines that are blank after preprocessing are ignored"
+      .reject { |p| p.start_with?('#') } # "if [a line starts with `#`], then this line is considered as a comment"
+      .each_with_object(Set.new(all_files)) do |p, working_set|
+        # determine the pattern (p) and whether it is to be added or removed from context
+        add = p.start_with?("!")
+        # strip leading "!" from pattern p, then prepend the base directory
+        matches = dockerignore_compatible_glob(File.join(directory, add ? p[1..-1] : p))
+        # add or remove the matched items as indicated in the ignore file
+        add ? working_set.merge(matches) : working_set.replace(working_set.difference(matches))
+      end
+    .to_a
+  end
+
   def create_relative_dir_tar(directory, output)
     Gem::Package::TarWriter.new(output) do |tar|
-      files = glob_all_files(File.join(directory, "**/*"))
-      remove_ignored_files!(directory, files)
+      files = docker_context(directory)
 
       files.each do |prefixed_file_name|
         stat = File.stat(prefixed_file_name)
@@ -259,21 +286,23 @@ module Docker::Util
     }
   end
 
-  def glob_all_files(pattern)
-    Dir.glob(pattern, File::FNM_DOTMATCH) - ['..', '.']
+  # do a directory glob that matches .dockerignore behavior
+  # specifically: matched directories are considered a recursive match
+  def dockerignore_compatible_glob(pattern)
+    begin
+      some_dirs, some_files = glob_all_files(pattern).partition { |f| File.directory?(f) }
+      # since all directories will be re-processed with a /**/* glob, we can preemptively
+      # eliminate any whose parent directory is already in this set.  This saves significant time.
+      some_files + some_dirs.reject { |d| some_dirs.any? { |pd| d.start_with?(pd) && d != pd } }
+    end.each_with_object(Set.new) do |f, acc|
+      # expand any directories by globbing; flatten results
+      acc.merge(File.directory?(f) ? glob_all_files("#{f}/**/*") : [f])
+    end
   end
 
-  def remove_ignored_files!(directory, files)
-    ignore = File.join(directory, '.dockerignore')
-    return unless files.include?(ignore)
-    ignored_files(directory, ignore).each { |f| files.delete(f) }
+  def glob_all_files(pattern)
+    # globs of "a_dir/**/*" can return "a_dir/.", so explicitly reject those
+    (Dir.glob(pattern, File::FNM_DOTMATCH) - ['..', '.']).reject { |p| p.end_with?("/.") }
   end
 
-  def ignored_files(directory, ignore_file)
-    patterns = File.read(ignore_file).split("\n").each(&:strip!)
-    patterns.reject! { |p| p.empty? || p.start_with?('#') }
-    patterns.map! { |p| File.join(directory, p) }
-    patterns.map! { |p| File.directory?(p) ? "#{p}/**/*" : p }
-    patterns.flat_map { |p| p =~ GLOB_WILDCARDS ? glob_all_files(p) : p }
-  end
 end

data/lib/docker/version.rb

@@ -1,4 +1,4 @@
 module Docker
   # The version of the docker-api gem.
-  VERSION = '2.0.0'
+  VERSION = '2.2.0'
 end

data/lib/docker.rb

@@ -106,17 +106,27 @@ module Docker
 
   # Get the version of Go, Docker, and optionally the Git commit.
   def version(connection = self.connection)
-    Util.parse_json(connection.get('/version'))
+    connection.version
   end
 
   # Get more information about the Docker server.
   def info(connection = self.connection)
-    Util.parse_json(connection.get('/info'))
+    connection.info
   end
 
   # Ping the Docker server.
   def ping(connection = self.connection)
-    connection.get('/_ping')
+    connection.ping
+  end
+
+  # Determine if the server is podman or docker.
+  def podman?(connection = self.connection)
+    connection.podman?
+  end
+
+  # Determine if the session is rootless.
+  def rootless?(connection = self.connection)
+    connection.rootless?
   end
 
   # Login to the Docker registry.
@@ -132,5 +142,5 @@ module Docker
   module_function :default_socket_url, :env_url, :url, :url=, :env_options,
                   :options, :options=, :creds, :creds=, :logger, :logger=,
                   :connection, :reset!, :reset_connection!, :version, :info,
-                  :ping, :authenticate!, :ssl_options
+                  :ping, :podman?, :rootless?, :authenticate!, :ssl_options
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-api
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Swipely, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: A simple REST client for the Docker Remote API