From d442269d396d5c5af9e5e6bdad6fa5b0c8ba6708 Mon Sep 17 00:00:00 2001 From: Diego Cabrejas Date: Thu, 4 Feb 2021 11:12:07 +0100 Subject: [PATCH 1/2] feat: lock mysql auth method --- wf2_core/src/recipes/m2/services/db.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wf2_core/src/recipes/m2/services/db.rs b/wf2_core/src/recipes/m2/services/db.rs index aa3c125..b7cdd68 100644 --- a/wf2_core/src/recipes/m2/services/db.rs +++ b/wf2_core/src/recipes/m2/services/db.rs @@ -72,6 +72,7 @@ impl Service for DbService { DbService::VOLUME_ENTRY ), ]) + .set_command("--default-authentication-plugin=mysql_native_password") .set_ports(vec!["3306:3306"]) .set_restart("unless-stopped") .set_env_file(vec![vars.content[&M2Var::EnvFile].to_string()]) @@ -120,7 +121,7 @@ mod tests { - traefik.enable=false ports: - "3306:3306" - + command: "--default-authentication-plugin=mysql_native_password" "#; let expected_dc: DcService = serde_yaml::from_str(expected).expect("test yaml"); From 99fbec85e37f15aea027c3e63c653b8b648e8d80 Mon Sep 17 00:00:00 2001 From: Diego Cabrejas Date: Thu, 4 Feb 2021 11:32:30 +0100 Subject: [PATCH 2/2] release v0.33.2 --- Cargo.lock | 4 ++-- wf2/Cargo.toml | 4 ++-- wf2_core/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0817668..0c1b54e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2183,7 +2183,7 @@ checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9" [[package]] name = "wf2" -version = "0.33.1" +version = "0.33.2" dependencies = [ "ansi_term", "clap", @@ -2199,7 +2199,7 @@ dependencies = [ [[package]] name = "wf2_core" -version = "0.33.1" +version = "0.33.2" dependencies = [ "ansi_term", "base64 0.11.0", diff --git a/wf2/Cargo.toml b/wf2/Cargo.toml index bf52c84..fa0ca83 100644 --- a/wf2/Cargo.toml +++ b/wf2/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wf2" -version = "0.33.1" +version = "0.33.2" authors = ["Shane Osbourne "] edition = "2018" description = "PHP docker environments" @@ -9,7 +9,7 @@ license = "MIT" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -wf2_core = { path = "../wf2_core", version = "0.33.1" } +wf2_core = { path = "../wf2_core", version = "0.33.2" } tokio = "0.1.20" futures = "0.1.27" clap = { version = "2.33.0", features = ["yaml"] } diff --git a/wf2_core/Cargo.toml b/wf2_core/Cargo.toml index 476c54d..c995b4b 100644 --- a/wf2_core/Cargo.toml +++ b/wf2_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wf2_core" -version = "0.33.1" +version = "0.33.2" authors = ["Shane Osbourne "] edition = "2018" description = "The engine for WF2"