diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb index e20fc08e..8d2bad6f 100644 --- a/lib/mrsk/commands/app.rb +++ b/lib/mrsk/commands/app.rb @@ -14,7 +14,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base "--restart unless-stopped", "--log-opt", "max-size=#{MAX_LOG_SIZE}", "--name", service_with_version_and_destination_and_role, - "-e", "MRSK_CONTAINER_NAME=\"#{service_with_version_and_destination}\"", + "-e", "MRSK_CONTAINER_NAME=\"#{service_with_version_and_destination_and_role}\"", *role.env_args, *config.volume_args, *role.label_args, diff --git a/test/commands/app_test.rb b/test/commands/app_test.rb index 34039820..80592ea6 100644 --- a/test/commands/app_test.rb +++ b/test/commands/app_test.rb @@ -40,7 +40,7 @@ class CommandsAppTest < ActiveSupport::TestCase assert_equal \ "docker run --detach --restart unless-stopped --log-opt max-size=10m --name app-jobs-999 -e MRSK_CONTAINER_NAME=\"app-jobs-999\" -e RAILS_MASTER_KEY=\"456\" --label service=\"app\" --label role=\"jobs\" --mount \"somewhere\" --cap-add dhh/app:999 bin/jobs", - @app.run(role: :jobs).join(" ") + @app.run.join(" ") end test "start" do diff --git a/test/commands/healthcheck_test.rb b/test/commands/healthcheck_test.rb index cd1f0d2d..effd3ef3 100644 --- a/test/commands/healthcheck_test.rb +++ b/test/commands/healthcheck_test.rb @@ -33,7 +33,7 @@ class CommandsHealthcheckTest < ActiveSupport::TestCase test "run with custom options" do @config[:servers] = { "web" => { "hosts" => [ "1.1.1.1" ], "options" => { "mount" => "somewhere" } } } assert_equal \ - "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app --mount \"somewhere\" dhh/app:123", + "docker run --detach --name healthcheck-app-123 --publish 3999:3000 --label service=healthcheck-app -e MRSK_CONTAINER_NAME=\"healthcheck-app\" --mount \"somewhere\" dhh/app:123", new_command.run.join(" ") end