Refactor DockerCompose to run with "-p"

Isolation other matrix with the project name("-p")

Author: hoppergee

lib/matrixeval/ruby/docker_compose.rb

@@ -12,25 +12,43 @@ def initialize(context)
       end
 
       def run(arguments)
-        forward_arguments = arguments.join(" ")
+        forward_arguments = arguments.map do |arg|
+          arg.match(/\s/) ? "\"#{arg}\"" : arg
+        end.join(" ")
+
+        no_tty = %w[bash sh zsh dash].include?(arguments[0]) ? '' : '--no-TTY' 
 
         system(
           <<~DOCKER_COMPOSE_COMMAND
-          docker compose -f #{yaml_file} \
+          #{docker_compose} \
           run --rm \
+          #{no_tty} \
           #{context.docker_compose_service_name} \
           #{forward_arguments}
           DOCKER_COMPOSE_COMMAND
         )
       ensure
+        stop_containers
+        clean_containers_and_anonymous_volumes
         turn_on_stty_opost
-        clean_linked_containers
       end
 
       private
 
-      def clean_linked_containers
-        system("docker compose -f #{yaml_file} down >> /dev/null 2>&1")
+      def stop_containers
+        system("#{docker_compose} stop >> /dev/null 2>&1")
+      end
+
+      def clean_containers_and_anonymous_volumes
+        system("#{docker_compose} rm -v -f >> /dev/null 2>&1")
+      end
+
+      def docker_compose
+        <<~DOCKER_COMPOSE_COMMAND.strip
+        docker --log-level error compose \
+        -f #{yaml_file} \
+        -p matrixeval-#{project_name}-#{context.id}
+        DOCKER_COMPOSE_COMMAND
       end
 
       def yaml_file
@@ -41,6 +59,10 @@ def turn_on_stty_opost
         system("stty opost")
       end
 
+      def project_name
+        Config.project_name.gsub(/[^A-Za-z0-9-]/,'_').downcase
+      end
+
     end
   end
 end

lib/matrixeval/ruby/docker_compose/file.rb

@@ -126,7 +126,7 @@ def working_dir_name
         end
 
         def project_name
-          Config.project_name.gsub(/[^A-Za-z0-9]/,'_').downcase
+          Config.project_name.gsub(/[^A-Za-z0-9-]/,'_').downcase
         end
 
       end

test/matrixeval/ruby/docker_compose_test.rb

@@ -11,6 +11,8 @@ def test_context
   end
 
   def test_run
+    Matrixeval::Ruby::Config::YAML.stubs(:yaml).returns({"project_name" => "dummy app"})
+
     context = Matrixeval::Ruby::Context.new(
       main_variant: Matrixeval::Ruby::Variant.new(
         {
@@ -42,15 +44,32 @@ def test_run
     )
     docker_compose = Matrixeval::Ruby::DockerCompose.new(context)
 
-    expected_docker_compose_command = <<~COMMAND
-      docker compose -f .matrixeval/docker-compose/ruby_3_0_rails_6_0_sidekiq_5_0.yml \
-      run --rm ruby_3_0 rake test
+    docker_compose.expects(:system).with(<<~COMMAND
+      docker --log-level error compose \
+      -f .matrixeval/docker-compose/ruby_3_0_rails_6_0_sidekiq_5_0.yml \
+      -p matrixeval-dummy_app-ruby_3_0_rails_6_0_sidekiq_5_0 \
+      run --rm --no-TTY \
+      ruby_3_0 rake test
       COMMAND
-    docker_compose.expects(:system).with(expected_docker_compose_command)
+    )
 
-    docker_compose.expects(:system).with("stty opost")
+    docker_compose.expects(:system).with(<<~COMMAND.strip
+      docker --log-level error compose \
+      -f .matrixeval/docker-compose/ruby_3_0_rails_6_0_sidekiq_5_0.yml \
+      -p matrixeval-dummy_app-ruby_3_0_rails_6_0_sidekiq_5_0 \
+      stop >> /dev/null 2>&1
+      COMMAND
+    )
 
-    docker_compose.expects(:system).with("docker compose -f .matrixeval/docker-compose/ruby_3_0_rails_6_0_sidekiq_5_0.yml down >> /dev/null 2>&1")
+    docker_compose.expects(:system).with(<<~COMMAND.strip
+      docker --log-level error compose \
+      -f .matrixeval/docker-compose/ruby_3_0_rails_6_0_sidekiq_5_0.yml \
+      -p matrixeval-dummy_app-ruby_3_0_rails_6_0_sidekiq_5_0 \
+      rm -v -f >> /dev/null 2>&1
+      COMMAND
+    )
+
+    docker_compose.expects(:system).with("stty opost")
 
     docker_compose.run(["rake", "test"])
   end