diff --git a/lib/mrsk/commands/accessory.rb b/lib/mrsk/commands/accessory.rb index 16e3b854..36eaa498 100644 --- a/lib/mrsk/commands/accessory.rb +++ b/lib/mrsk/commands/accessory.rb @@ -12,6 +12,7 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base "--name", service_name, "-d", "--restart", "unless-stopped", + "--log-driver", "local", "-p", port, *env_args, *volume_args, diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb index 9c8407ac..015b01c2 100644 --- a/lib/mrsk/commands/app.rb +++ b/lib/mrsk/commands/app.rb @@ -5,6 +5,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base docker :run, "-d", "--restart unless-stopped", + "--log-driver", "local", "--name", service_with_version, *role.env_args, *config.volume_args, diff --git a/lib/mrsk/commands/traefik.rb b/lib/mrsk/commands/traefik.rb index dd0715cf..daff6d3f 100644 --- a/lib/mrsk/commands/traefik.rb +++ b/lib/mrsk/commands/traefik.rb @@ -2,7 +2,8 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base def run docker :run, "--name traefik", "-d", - "--restart unless-stopped", + "--restart", "unless-stopped", + "--log-driver", "local", "-p 80:80", "-v /var/run/docker.sock:/var/run/docker.sock", "traefik", diff --git a/test/cli/accessory_test.rb b/test/cli/accessory_test.rb index dde44a61..4086874e 100644 --- a/test/cli/accessory_test.rb +++ b/test/cli/accessory_test.rb @@ -14,7 +14,7 @@ class CliAccessoryTest < CliTestCase end test "boot" do - assert_match "Running docker run --name app-mysql -d --restart unless-stopped -p 3306:3306 -e [REDACTED] -e MYSQL_ROOT_HOST=% --volume $PWD/app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf --volume $PWD/app-mysql/data:/var/lib/mysql --label service=app-mysql mysql:5.7 on 1.1.1.3", run_command("boot", "mysql") + assert_match "Running docker run --name app-mysql -d --restart unless-stopped --log-driver local -p 3306:3306 -e [REDACTED] -e MYSQL_ROOT_HOST=% --volume $PWD/app-mysql/etc/mysql/my.cnf:/etc/mysql/my.cnf --volume $PWD/app-mysql/data:/var/lib/mysql --label service=app-mysql mysql:5.7 on 1.1.1.3", run_command("boot", "mysql") end test "exec" do diff --git a/test/commands/accessory_test.rb b/test/commands/accessory_test.rb index 8ef1f493..8874bcab 100644 --- a/test/commands/accessory_test.rb +++ b/test/commands/accessory_test.rb @@ -49,11 +49,11 @@ class CommandsAccessoryTest < ActiveSupport::TestCase test "run" do assert_equal \ - "docker run --name app-mysql -d --restart unless-stopped -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret123 -e MYSQL_ROOT_HOST=% --label service=app-mysql mysql:8.0", + "docker run --name app-mysql -d --restart unless-stopped --log-driver local -p 3306:3306 -e MYSQL_ROOT_PASSWORD=secret123 -e MYSQL_ROOT_HOST=% --label service=app-mysql mysql:8.0", @mysql.run.join(" ") assert_equal \ - "docker run --name app-redis -d --restart unless-stopped -p 6379:6379 -e SOMETHING=else --volume /var/lib/redis:/data --label service=app-redis --label cache=true redis:latest", + "docker run --name app-redis -d --restart unless-stopped --log-driver local -p 6379:6379 -e SOMETHING=else --volume /var/lib/redis:/data --label service=app-redis --label cache=true redis:latest", @redis.run.join(" ") end diff --git a/test/commands/app_test.rb b/test/commands/app_test.rb index f38ca87f..a95e5cbe 100644 --- a/test/commands/app_test.rb +++ b/test/commands/app_test.rb @@ -14,7 +14,7 @@ class CommandsAppTest < ActiveSupport::TestCase test "run" do assert_equal \ - "docker run -d --restart unless-stopped --name app-999 -e RAILS_MASTER_KEY=456 --label service=app --label role=web --label traefik.http.routers.app.rule='PathPrefix(`/`)' --label traefik.http.services.app.loadbalancer.healthcheck.path=/up --label traefik.http.services.app.loadbalancer.healthcheck.interval=1s --label traefik.http.middlewares.app.retry.attempts=3 --label traefik.http.middlewares.app.retry.initialinterval=500ms dhh/app:999", + "docker run -d --restart unless-stopped --log-driver local --name app-999 -e RAILS_MASTER_KEY=456 --label service=app --label role=web --label traefik.http.routers.app.rule='PathPrefix(`/`)' --label traefik.http.services.app.loadbalancer.healthcheck.path=/up --label traefik.http.services.app.loadbalancer.healthcheck.interval=1s --label traefik.http.middlewares.app.retry.attempts=3 --label traefik.http.middlewares.app.retry.initialinterval=500ms dhh/app:999", @app.run.join(" ") end @@ -22,7 +22,7 @@ class CommandsAppTest < ActiveSupport::TestCase @config[:volumes] = ["/local/path:/container/path" ] assert_equal \ - "docker run -d --restart unless-stopped --name app-999 -e RAILS_MASTER_KEY=456 --volume /local/path:/container/path --label service=app --label role=web --label traefik.http.routers.app.rule='PathPrefix(`/`)' --label traefik.http.services.app.loadbalancer.healthcheck.path=/up --label traefik.http.services.app.loadbalancer.healthcheck.interval=1s --label traefik.http.middlewares.app.retry.attempts=3 --label traefik.http.middlewares.app.retry.initialinterval=500ms dhh/app:999", + "docker run -d --restart unless-stopped --log-driver local --name app-999 -e RAILS_MASTER_KEY=456 --volume /local/path:/container/path --label service=app --label role=web --label traefik.http.routers.app.rule='PathPrefix(`/`)' --label traefik.http.services.app.loadbalancer.healthcheck.path=/up --label traefik.http.services.app.loadbalancer.healthcheck.interval=1s --label traefik.http.middlewares.app.retry.attempts=3 --label traefik.http.middlewares.app.retry.initialinterval=500ms dhh/app:999", @app.run.join(" ") end diff --git a/test/commands/traefik_test.rb b/test/commands/traefik_test.rb index 61d09abe..cfe269ae 100644 --- a/test/commands/traefik_test.rb +++ b/test/commands/traefik_test.rb @@ -10,7 +10,7 @@ class CommandsTraefikTest < ActiveSupport::TestCase test "run" do assert_equal \ - "docker run --name traefik -d --restart unless-stopped -p 80:80 -v /var/run/docker.sock:/var/run/docker.sock traefik --providers.docker --log.level=DEBUG --accesslog.format json --metrics.prometheus.buckets 0.1,0.3,1.2,5.0", + "docker run --name traefik -d --restart unless-stopped --log-driver local -p 80:80 -v /var/run/docker.sock:/var/run/docker.sock traefik --providers.docker --log.level=DEBUG --accesslog.format json --metrics.prometheus.buckets 0.1,0.3,1.2,5.0", new_command.run.join(" ") end