yast-rake 0.2.41 → 0.2.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea95f9f06d6f3ab9b3a4e5078bf6ac60a87379540571f3c5b99bdea42dfb83c
-  data.tar.gz: 2e15ce0eb612f90be1ae9f65906283ddfaf0d3f6159fe816954a4ceb5a22c4cc
+  metadata.gz: fb204b6229ee0b7fa908d64fd928e5f071e1f29f11ffb991d051c2f247d8bc02
+  data.tar.gz: 9c49cd7705d06f94a2eaf8dc2e15add41bab65dccb0cd4fa4bcbd853153f15d5
 SHA512:
-  metadata.gz: 9cb29be7fb662e4c53e693efe4c907183210b9b1fb6f7abbb941a791001b64e0c4c7a1aab312d83846ae4aac73755d64957136a36de9e4861ec4cd5fb43184b5
-  data.tar.gz: ac4dbcc62bcb8a0497205a24f5aac12d6d30137f1832769576e3ac8df5654db9fb3aaa179ab3348b6f6be6ebd427e9264d65a1fb30c99606a1e12eff54efa87b
+  metadata.gz: 13f7ba78e61769db2e6eb702631ce6caa25e0e65c355dfd060fb71b10a1e1077a158d4387841a1c7893631e3af9e5784ca0886ef057314047872c21c928dadca
+  data.tar.gz: acf04f3a336c6d0f2897dbfee0b064f0c1a5dd74b46213541d778f35767cae04a433f08fb0e5d7ea9278a17d814e48dff790443fc9955fca53f85a5d4281ce73

data/VERSION

@@ -1 +1 @@
-0.2.41
+0.2.42

data/lib/tasks/container_runner.rb

@@ -28,8 +28,7 @@ class ContainerRunner
   # @param client [String,nil] the client name, nil or empty string = find
   #   the client automatically
   def run(client)
-    image = find_image
-    container = GithubActions::Container.new(image)
+    container = find_container
     container.pull
     container.start
     container.copy_current_dir
@@ -44,16 +43,16 @@ private
 
   # find the Docker image to use in the container
   # @return [String] the image name
-  def find_image
+  def find_container
     # explicitly requested image
     image = ENV["DOCKER_IMAGE"]
-    return image if image && !image.empty?
+    return GithubActions::Container.new(image) if image && !image.empty?
 
     # scan the Docker images used in the GitHub Actions
-    images = workflow_images
-    return images.first if images.size == 1
+    containers = workflow_containers
+    return containers.first if containers.size == 1
 
-    if images.empty?
+    if containers.empty?
       error("No Docker image was found in the GitHub Actions")
       puts "Use DOCKER_IMAGE=<name> option for specifying the image name"
       abort
@@ -61,20 +60,36 @@ private
 
     # multiple images found
     error("Found multiple Docker images in the GitHub Actions:")
-    error(images.inspect)
+    error(containers.map { |c| [c.image, c.options] })
     puts "Use DOCKER_IMAGE=<name> option for specifying the image name"
+    puts "and DOCKER_OPTIONS=<options> option for specifying the extra Docker"
+    puts "command line parameters."
     abort
   end
 
   # extract the Docker images from the GitHub Actions,
   # the duplicates are removed
-  # @return [Array<String>] image names
-  def workflow_images
-    GithubActions::Workflow.read.each_with_object([]) do |workflow, images|
+  # @return [Array<GithubActions::Container>] image names
+  def workflow_containers
+    ret = GithubActions::Workflow.read.each_with_object([]) do |workflow, containers|
       workflow.jobs.each do |job|
-        container = job.container
-        images << container if container && !images.include?(container)
+        container_data = job.container
+
+        if container_data.is_a?(String)
+          containers << GithubActions::Container.new(container_data)
+        elsif container_data.is_a?(Hash)
+          # to_s converts missing options (nil) to empty options ("")
+          # to treat these as equal in comparison
+          containers << GithubActions::Container.new(
+            container_data["image"],
+            container_data["options"].to_s
+          )
+        else
+          abort "Unsupported container definition: #{container_data.inspect}"
+        end
       end
     end
+
+    ret.uniq { |c| [c.image, c.options] }
   end
 end

data/lib/tasks/github_actions/github_actions/container.rb

@@ -26,7 +26,7 @@ module GithubActions
   class Container
     include Colorizer
 
-    attr_reader :image, :container
+    attr_reader :image, :options, :container
 
     # the default timeout in seconds, maximum time for the running container,
     # after the time runs out the container is automatically stopped and removed
@@ -43,8 +43,10 @@ module GithubActions
 
     # constructor
     # @param image [String] name of the Docker image to use
-    def initialize(image)
+    # @param options [String, nil] extra docker options
+    def initialize(image, options = nil)
       @image = image
+      @options = options
     end
 
     # pull the Docker image, ensure that the latest version is used
@@ -73,7 +75,7 @@ module GithubActions
       end
 
       cmd = "docker create #{env_options(ENV_VARIABLES)} --rm --entrypoint " \
-        "#{run} #{image.shellescape} #{args}"
+        "#{run} #{options} #{ENV["DOCKER_OPTIONS"]} #{image.shellescape} #{args}"
 
       # contains the container ID
       @container = `#{cmd}`.chomp

data/lib/tasks/github_actions/github_actions/job_runner.rb

@@ -58,12 +58,29 @@ module GithubActions
 
     # pull the Docker image and start the container
     def start_container
-      # prefer the custom image if requested
-      @container = Container.new(image || job.container)
+      @container = find_container
       container.pull
       container.start
     end
 
+    # Get the container configuration
+    # @return [Container] container which should run the job
+    def find_container
+      # prefer the custom image if requested
+      image_name = if image
+        image
+      elsif job.container.is_a?(String)
+        job.container
+      elsif job.container.is_a?(Hash)
+        options = job.container["options"]
+        job.container["image"]
+      else
+        abort "Unsupported container definition: #{job.container.inspect}"
+      end
+
+      Container.new(image_name, options.to_s)
+    end
+
     # run a job step
     # @param step [GithubActions::Step] the step to run
     # @return [Boolean] `true` if the step succeeded, `false` otherwise

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yast-rake
 version: !ruby/object:Gem::Version
-  version: 0.2.41
+  version: 0.2.42
 platform: ruby
 authors:
 - Josef Reidinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: packaging_rake_tasks