Nested image in container for support override docker env

Author: hoppergee

lib/matrixeval/ruby/container.rb

@@ -0,0 +1,15 @@
+module Matrixeval
+  module Ruby
+    class Container
+
+      attr_reader :image, :env
+
+      def initialize(options)
+        options ||= {}
+        @image = options["image"]
+        @env = options["env"] || {}
+      end
+
+    end
+  end
+end

lib/matrixeval/ruby/docker_compose/yaml.rb

@@ -29,15 +29,15 @@ def services_json
 
             Config.main_vector_variants.map do |variant|
               services[variant.docker_compose_service_name] = {
-                "image" => variant.image,
+                "image" => variant.container.image,
                 "volumes" => mounts(variant),
                 "environment" => {
                   "BUNDLE_PATH" => "/bundle",
                   "GEM_HOME" => "/bundle",
                   "BUNDLE_APP_CONFIG" => "/bundle",
                   "BUNDLE_BIN" => "/bundle/bin",
                   "PATH" => "/app/bin:/bundle/bin:$PATH"
-                },
+                }.merge(variant.container.env),
                 "working_dir" => "/app"
               }
             end

lib/matrixeval/ruby/templates/matrixeval.yml

@@ -5,9 +5,12 @@ matrix:
   ruby:
     variants:
       - key: 2.7
-        image: ruby:2.7.1
+        container:
+          image: ruby:2.7.1
       - key: 3.0
-        image: ruby:3.0.0
         default: true
+        container:
+          image: ruby:3.0.0
       - key: 3.1
-        image: ruby:3.1.0
+        container:
+          image: ruby:3.1.0

lib/matrixeval/ruby/variant.rb

@@ -1,3 +1,5 @@
+require_relative "./container"
+
 module Matrixeval
   module Ruby
     class Variant
@@ -7,14 +9,14 @@ def default(key, vector)
         end
       end
 
-      attr_reader :key, :image, :env, :vector, :default
+      attr_reader :key, :env, :vector, :default, :container
 
       def initialize(config = {}, vector)
         raise Error.new("Variant#key is missing") if config["key"].nil?
 
         @vector = vector
         @key = config["key"].to_s
-        @image = config["image"]
+        @container = Container.new(config["container"])
         @env = config["env"] || {}
         @default = config["default"] || false
       end
@@ -24,7 +26,7 @@ def name
       end
 
       def bundle_volume_name
-        "bundle_#{image.gsub(/[^A-Za-z0-9]/,'_')}"
+        "bundle_#{container.image.gsub(/[^A-Za-z0-9]/,'_')}"
       end
 
       def id

lib/matrixeval/ruby/vector.rb

@@ -30,7 +30,7 @@ def id
       def default_variant
         variant = variants.find(&:default?)
         if variant.nil?
-          raise Error.new("Please set a default variant for matrix #{vector.key}")
+          raise Error.new("Please set a default variant for matrix #{key}")
         end
 
         variant

test/matrixeval/ruby/command_line/parse_context_arguments_test.rb

@@ -11,13 +11,13 @@ def setup
       "matrix" => {
         "ruby" => {
           "variants" => [
-            { "key" => "3.0" },
+            { "key" => "3.0", "default" => true },
             { "key" => "3.1" }
           ]
         },
         "active_model" => {
           "variants" => [
-            { "key" => "6.1" },
+            { "key" => "6.1", "default" => true },
             { "key" => "7.0" }
           ]
         }

test/matrixeval/ruby/docker_compose/yaml_test.rb

@@ -18,14 +18,14 @@ def test_create
       "matrix" => {
         "ruby" => {
           "variants" => [
-            { "key" => "3.0", "image" => "ruby:3.0.0" },
-            { "key" => "3.1", "image" => "ruby:3.1.0" },
+            { "key" => "3.0", "container" => { "image" => "ruby:3.0.0" } },
+            { "key" => "3.1", "container" => { "image" => "ruby:3.1.0" } }
           ]
         },
         "active_model" => {
           "variants" => [
             { "key" => "6.1", "env" => { "ACTIVE_MODEL_VERSION" => "6.1.4" } },
-            { "key" => "7.0", "env" => { "ACTIVE_MODEL_VERSION" => "7.0.0" } },
+            { "key" => "7.0", "env" => { "ACTIVE_MODEL_VERSION" => "7.0.0" } }
           ]
         }
       }

test/matrixeval/ruby/runner_test.rb

@@ -47,10 +47,12 @@ def test_start_with_existing_config_file
           ruby:
             variants:
               - key: 3.0
-                image: ruby:3.0.0
+                container:
+                  image: ruby:3.0.0
                 default: true
               - key: 3.1
-                image: ruby:3.1.0
+                container:
+                  image: ruby:3.1.0
           rails:
             variants:
               - key: 6.0

test/matrixeval/ruby/variant_test.rb

@@ -19,9 +19,10 @@ def test_key_missing
     end
   end
 
-  def test_image
-    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "image" => "ruby:3.1.0"}, @vector)
-    assert_equal "3.1", variant.key
+  def test_container
+    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "container" => { "image" => "ruby:3.1.0"} }, @vector)
+    assert variant.container.is_a?(Matrixeval::Ruby::Container)
+    assert_equal "ruby:3.1.0", variant.container.image
   end
 
   def test_env
@@ -35,22 +36,22 @@ def test_vector
   end
 
   def test_bundle_volume_name
-    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "image" => "ruby:3.1.0"}, @vector)
+    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "container" => { "image" => "ruby:3.1.0"} }, @vector)
     assert_equal "bundle_ruby_3_1_0", variant.bundle_volume_name
   end
 
   def test_id
-    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "image" => "ruby:3.1.0"}, @vector)
+    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "container" => { "image" => "ruby:3.1.0"} }, @vector)
     assert_equal "ruby_3_1", variant.id
   end
 
   def test_docker_compose_service_name
-    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "image" => "ruby:3.1.0"}, @vector)
+    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "container" => { "image" => "ruby:3.1.0"} }, @vector)
     assert_equal "ruby_3_1", variant.docker_compose_service_name
   end
 
   def test_pathname
-    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "image" => "ruby:3.1.0"}, @vector)
+    variant = Matrixeval::Ruby::Variant.new({"key" => 3.1, "container" => { "image" => "ruby:3.1.0"} }, @vector)
     assert_equal "ruby_3_1", variant.pathname
   end