Refactor DockerCompose::File to create file with new config format

Author: hoppergee

lib/matrixeval/ruby/docker_compose/file.rb

@@ -42,16 +42,11 @@ def docker_compose_file_path
         def build_content
           {
             "version" => "3",
-            "networks" => { network => nil },
             "services" => services_json,
             "volumes" => volumes_json
           }.to_yaml.sub(/---\n/, "")
         end
 
-        def network
-          "matrixeval-#{context.id}"
-        end
-
         def services_json
           services = {}
 
@@ -64,12 +59,11 @@ def services_json
               "BUNDLE_APP_CONFIG" => "/bundle",
               "BUNDLE_BIN" => "/bundle/bin",
               "PATH" => "/app/bin:/bundle/bin:$PATH"
-            }.merge(context.env).merge(main_variant.container.env),
-            "working_dir" => "/app",
-            "networks" => [network],
+            }.merge(extra_env),
+            "working_dir" => "/app"
           }.merge(depends_on)
 
-          services.merge(extra_services)
+          services.merge(docker_compose_extend.services)
         end
 
         def volumes_json
@@ -88,10 +82,9 @@ def depends_on
           end
         end
 
-        def extra_services
-          docker_compose_extend.services.map do |name, config|
-            [name, config.merge({'networks' => [network]})]
-          end.to_h
+        def extra_env
+          Config.env.merge(context.env)
+                    .merge(main_variant.container.env)
         end
 
         def main_variant
@@ -107,7 +100,21 @@ def mounts(variant)
             "../..:/app:cached",
             "#{variant.bundle_volume_name}:/bundle",
             "../Gemfile.lock.#{context.id}:/app/Gemfile.lock"
-          ] + Config.main_vector.mounts
+          ] + extra_mounts
+        end
+
+        def extra_mounts
+          mounts = Config.mounts + context.variants.map(&:mounts).flatten
+          mounts.map do |mount|
+            local_path, in_docker_path = mount.split(':')
+            next mount if Pathname.new(local_path).absolute?
+
+            local_path = Matrixeval.working_dir.join(local_path)
+            docker_compose_folder_path = Matrixeval.working_dir.join(".matrixeval/docker-compose")
+            local_path = local_path.relative_path_from docker_compose_folder_path
+
+            "#{local_path}:#{in_docker_path}"
+          end
         end
 
         def docker_compose_extend

test/matrixeval/ruby/docker_compose/file_test.rb

@@ -16,6 +16,10 @@ def test_create_all
       "version" => "0.2",
       "target" => "ruby",
       "project_name" => "Dummy_gem",
+      "mounts" => ["/a/b:/app/c/d"],
+      "env" => {
+        "DATABASE_HOST" => "postgres"
+      },
       "matrix" => {
         "ruby" => {
           "variants" => [
@@ -25,8 +29,21 @@ def test_create_all
         },
         "active_model" => {
           "variants" => [
-            { "key" => "6.1", "env" => { "ACTIVE_MODEL_VERSION" => "6.1.4" }, "default" => true },
-            { "key" => "7.0", "env" => { "ACTIVE_MODEL_VERSION" => "7.0.0" } }
+            {
+              "key" => "6.1",
+              "env" => { "ACTIVE_MODEL_VERSION" => "6.1.4" },
+              "default" => true,
+              "mounts" => [
+                ".matrixeval/schema/rails_6_1.rb:/app/test/dummy/db/schema.rb"
+              ]
+            },
+            {
+              "key" => "7.0",
+              "env" => { "ACTIVE_MODEL_VERSION" => "7.0.0" },
+              "mounts" => [
+                ".matrixeval/schema/rails_7_0.rb:/app/test/dummy/db/schema.rb"
+              ]
+            }
           ]
         }
       },
@@ -35,15 +52,15 @@ def test_create_all
           "postgres" => {
             "image" => "postgres:12.8",
             "volumes" => [
-              "postgres12-<%= matrix_combination_id %>:/var/lib/postgresql/data"
+              "postgres12:/var/lib/postgresql/data"
             ],
             "environment" => {
               "POSTGRES_HOST_AUTH_METHOD" => "trust"
             }
           }
         },
         "volumes" => {
-          "postgres12-<%= matrix_combination_id %>" => nil
+          "postgres12" => nil
         }
       }
     })
@@ -53,156 +70,144 @@ def test_create_all
 
     expect_file_content = <<~DOCKER_COMPOSE
       version: '3'
-      networks:
-        matrixeval-ruby_3_0_active_model_6_1:
       services:
         ruby_3_0:
           image: ruby:3.0.0
           volumes:
           - "../..:/app:cached"
           - bundle_ruby_3_0_0:/bundle
           - "../Gemfile.lock.ruby_3_0_active_model_6_1:/app/Gemfile.lock"
+          - "/a/b:/app/c/d"
+          - "../schema/rails_6_1.rb:/app/test/dummy/db/schema.rb"
           environment:
             BUNDLE_PATH: "/bundle"
             GEM_HOME: "/bundle"
             BUNDLE_APP_CONFIG: "/bundle"
             BUNDLE_BIN: "/bundle/bin"
             PATH: "/app/bin:/bundle/bin:$PATH"
+            DATABASE_HOST: postgres
             ACTIVE_MODEL_VERSION: 6.1.4
           working_dir: "/app"
-          networks:
-          - matrixeval-ruby_3_0_active_model_6_1
           depends_on:
           - postgres
         postgres:
           image: postgres:12.8
           volumes:
-          - postgres12-ruby_3_0_active_model_6_1:/var/lib/postgresql/data
+          - postgres12:/var/lib/postgresql/data
           environment:
             POSTGRES_HOST_AUTH_METHOD: trust
-          networks:
-          - matrixeval-ruby_3_0_active_model_6_1
       volumes:
         bundle_ruby_3_0_0:
           name: bundle_ruby_3_0_0
-        postgres12-ruby_3_0_active_model_6_1:
+        postgres12:
       DOCKER_COMPOSE
     assert_equal expect_file_content, file_content
 
     file_content = File.read(dummy_gem_docker_compose_folder_path.join("ruby_3_0_active_model_7_0.yml"))
     expect_file_content = <<~DOCKER_COMPOSE
       version: '3'
-      networks:
-        matrixeval-ruby_3_0_active_model_7_0:
       services:
         ruby_3_0:
           image: ruby:3.0.0
           volumes:
           - "../..:/app:cached"
           - bundle_ruby_3_0_0:/bundle
           - "../Gemfile.lock.ruby_3_0_active_model_7_0:/app/Gemfile.lock"
+          - "/a/b:/app/c/d"
+          - "../schema/rails_7_0.rb:/app/test/dummy/db/schema.rb"
           environment:
             BUNDLE_PATH: "/bundle"
             GEM_HOME: "/bundle"
             BUNDLE_APP_CONFIG: "/bundle"
             BUNDLE_BIN: "/bundle/bin"
             PATH: "/app/bin:/bundle/bin:$PATH"
+            DATABASE_HOST: postgres
             ACTIVE_MODEL_VERSION: 7.0.0
           working_dir: "/app"
-          networks:
-          - matrixeval-ruby_3_0_active_model_7_0
           depends_on:
           - postgres
         postgres:
           image: postgres:12.8
           volumes:
-          - postgres12-ruby_3_0_active_model_7_0:/var/lib/postgresql/data
+          - postgres12:/var/lib/postgresql/data
           environment:
             POSTGRES_HOST_AUTH_METHOD: trust
-          networks:
-          - matrixeval-ruby_3_0_active_model_7_0
       volumes:
         bundle_ruby_3_0_0:
           name: bundle_ruby_3_0_0
-        postgres12-ruby_3_0_active_model_7_0:
+        postgres12:
       DOCKER_COMPOSE
     assert_equal expect_file_content, file_content
 
     file_content = File.read(dummy_gem_docker_compose_folder_path.join("ruby_3_1_active_model_6_1.yml"))
     expect_file_content = <<~DOCKER_COMPOSE
       version: '3'
-      networks:
-        matrixeval-ruby_3_1_active_model_6_1:
       services:
         ruby_3_1:
           image: ruby:3.1.0
           volumes:
           - "../..:/app:cached"
           - bundle_ruby_3_1_0:/bundle
           - "../Gemfile.lock.ruby_3_1_active_model_6_1:/app/Gemfile.lock"
+          - "/a/b:/app/c/d"
+          - "../schema/rails_6_1.rb:/app/test/dummy/db/schema.rb"
           environment:
             BUNDLE_PATH: "/bundle"
             GEM_HOME: "/bundle"
             BUNDLE_APP_CONFIG: "/bundle"
             BUNDLE_BIN: "/bundle/bin"
             PATH: "/app/bin:/bundle/bin:$PATH"
+            DATABASE_HOST: postgres
             ACTIVE_MODEL_VERSION: 6.1.4
           working_dir: "/app"
-          networks:
-          - matrixeval-ruby_3_1_active_model_6_1
           depends_on:
           - postgres
         postgres:
           image: postgres:12.8
           volumes:
-          - postgres12-ruby_3_1_active_model_6_1:/var/lib/postgresql/data
+          - postgres12:/var/lib/postgresql/data
           environment:
             POSTGRES_HOST_AUTH_METHOD: trust
-          networks:
-          - matrixeval-ruby_3_1_active_model_6_1
       volumes:
         bundle_ruby_3_1_0:
           name: bundle_ruby_3_1_0
-        postgres12-ruby_3_1_active_model_6_1:
+        postgres12:
       DOCKER_COMPOSE
     assert_equal expect_file_content, file_content
 
     file_content = File.read(dummy_gem_docker_compose_folder_path.join("ruby_3_1_active_model_7_0.yml"))
     expect_file_content = <<~DOCKER_COMPOSE
       version: '3'
-      networks:
-        matrixeval-ruby_3_1_active_model_7_0:
       services:
         ruby_3_1:
           image: ruby:3.1.0
           volumes:
           - "../..:/app:cached"
           - bundle_ruby_3_1_0:/bundle
           - "../Gemfile.lock.ruby_3_1_active_model_7_0:/app/Gemfile.lock"
+          - "/a/b:/app/c/d"
+          - "../schema/rails_7_0.rb:/app/test/dummy/db/schema.rb"
           environment:
             BUNDLE_PATH: "/bundle"
             GEM_HOME: "/bundle"
             BUNDLE_APP_CONFIG: "/bundle"
             BUNDLE_BIN: "/bundle/bin"
             PATH: "/app/bin:/bundle/bin:$PATH"
+            DATABASE_HOST: postgres
             ACTIVE_MODEL_VERSION: 7.0.0
           working_dir: "/app"
-          networks:
-          - matrixeval-ruby_3_1_active_model_7_0
           depends_on:
           - postgres
         postgres:
           image: postgres:12.8
           volumes:
-          - postgres12-ruby_3_1_active_model_7_0:/var/lib/postgresql/data
+          - postgres12:/var/lib/postgresql/data
           environment:
             POSTGRES_HOST_AUTH_METHOD: trust
-          networks:
-          - matrixeval-ruby_3_1_active_model_7_0
       volumes:
         bundle_ruby_3_1_0:
           name: bundle_ruby_3_1_0
-        postgres12-ruby_3_1_active_model_7_0:
+        postgres12:
       DOCKER_COMPOSE
     assert_equal expect_file_content, file_content
   end