Merge branch 'main' into global-logging-config

2023-03-24 15:32:41 +01:00
parent 4044abdde1 e2e5e18af9
commit b5ccc1fa5d
4 changed files with 18 additions and 2 deletions
--- a/test/commands/app_test.rb
+++ b/test/commands/app_test.rb
@@ -67,6 +67,13 @@ class CommandsAppTest < ActiveSupport::TestCase
      new_command.stop.join(" ")
  end

+  test "stop with custom stop wait time" do
+    @config[:stop_wait_time] = 30
+    assert_equal \
+      "docker ps --quiet --filter label=service=app --filter label=role=web | xargs docker stop -t 30",
+      new_command.stop.join(" ")
+  end
+
  test "stop with version" do
    assert_equal \
      "docker container ls --all --filter name=app-web-123 --quiet | xargs docker stop",