Merge pull request #118 from WeareJH/mysql-default-auth

Lock down mysql auth method
WeareJH · Feb 4, 2021 · 44b03f3 · 44b03f3
2 parents 49cfe95 + 99fbec8
commit 44b03f3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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 <[email protected]>"]
 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
@@ -1,6 +1,6 @@
 [package]
 name = "wf2_core"
-version = "0.33.1"
+version = "0.33.2"
 authors = ["Shane Osbourne <[email protected]>"]
 edition = "2018"
 description = "The engine for WF2"

diff --git a/wf2_core/src/recipes/m2/services/db.rs b/wf2_core/src/recipes/m2/services/db.rs
@@ -72,6 +72,7 @@ impl Service<M2Vars> 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");