From 171535cfd79ce4373dc2e89d594aefc709f86c02 Mon Sep 17 00:00:00 2001 From: Florian Hockmann Date: Fri, 30 Jun 2023 19:34:12 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20Replace=C2=A0mysql=20with=C2=A0mariadb?= =?UTF-8?q?=20binary=20in=C2=A0MariaDB=C2=A0module=20(#942)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Testcontainers.MariaDb/MariaDbBuilder.cs | 2 +- src/Testcontainers.MariaDb/MariaDbContainer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Testcontainers.MariaDb/MariaDbBuilder.cs b/src/Testcontainers.MariaDb/MariaDbBuilder.cs index 4a3a1713e..87da769fc 100644 --- a/src/Testcontainers.MariaDb/MariaDbBuilder.cs +++ b/src/Testcontainers.MariaDb/MariaDbBuilder.cs @@ -135,7 +135,7 @@ private sealed class WaitUntil : IWaitUntil /// The container configuration. public WaitUntil(MariaDbConfiguration configuration) { - _command = new List { "mysql", "--protocol=TCP", $"--port={MariaDbPort}", $"--user={configuration.Username}", $"--password={configuration.Password}", configuration.Database, "--wait", "--silent", "--execute=SELECT 1;" }; + _command = new List { "mariadb", "--protocol=TCP", $"--port={MariaDbPort}", $"--user={configuration.Username}", $"--password={configuration.Password}", configuration.Database, "--wait", "--silent", "--execute=SELECT 1;" }; } /// diff --git a/src/Testcontainers.MariaDb/MariaDbContainer.cs b/src/Testcontainers.MariaDb/MariaDbContainer.cs index ec9f7b49d..97fba03c9 100644 --- a/src/Testcontainers.MariaDb/MariaDbContainer.cs +++ b/src/Testcontainers.MariaDb/MariaDbContainer.cs @@ -45,7 +45,7 @@ public async Task ExecScriptAsync(string scriptContent, Cancellation await CopyAsync(Encoding.Default.GetBytes(scriptContent), scriptFilePath, Unix.FileMode644, ct) .ConfigureAwait(false); - return await ExecAsync(new[] { "mysql", "--protocol=TCP", $"--port={MariaDbBuilder.MariaDbPort}", $"--user={_configuration.Username}", $"--password={_configuration.Password}", _configuration.Database, $"--execute=source {scriptFilePath};" }, ct) + return await ExecAsync(new[] { "mariadb", "--protocol=TCP", $"--port={MariaDbBuilder.MariaDbPort}", $"--user={_configuration.Username}", $"--password={_configuration.Password}", _configuration.Database, $"--execute=source {scriptFilePath};" }, ct) .ConfigureAwait(false); } } \ No newline at end of file