Skip to content

Commit 9f0de77

Browse files
committed
refactor: mysql container
1 parent 1c635b6 commit 9f0de77

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

docker-controller-scala-mysql/src/main/scala/com/github/j5ik2o/dockerController/mysql/MySQLController.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import scala.concurrent.duration.{ DurationInt, FiniteDuration }
1111

1212
object MySQLController {
1313
final val DefaultImageName: String = "mysql"
14-
final val DefaultImageTag: Option[String] = Some("5.7")
14+
final val DefaultImageTag: Option[String] = Some("8.0")
1515
final val DefaultContainerPort: Int = 3306
1616

1717
def apply(
@@ -47,8 +47,6 @@ class MySQLController(
4747
databaseName: Option[String] = None
4848
) extends DockerControllerImpl(dockerClient, outputFrameInterval)(imageName, imageTag) {
4949

50-
override protected def isPlatformLinuxAmd64AtM1Mac: Boolean = true
51-
5250
private val environmentVariables: Map[String, String] = {
5351
val env1 = Map[String, String](
5452
"MYSQL_ROOT_PASSWORD" -> rootPassword

docker-controller-scala-mysql/src/test/scala/com/github/j5ik2o/dockerController/MySQLControllerSpec.scala

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class MySQLControllerSpec extends AnyFreeSpec with DockerControllerSpecSupport w
2323
override protected def flywayDbPassword: String = rootPassword
2424

2525
override protected def flywayJDBCUrl: String =
26-
s"jdbc:mysql://$flywayDbHost:$flywayDbHostPort/$flywayDbName?useSSL=false&user=$flywayDbUserName&password=$flywayDbPassword"
26+
s"jdbc:mysql://$flywayDbHost:$flywayDbHostPort/$flywayDbName?allowPublicKeyRetrieval=true&useSSL=false&user=$flywayDbUserName&password=$flywayDbPassword"
2727

2828
val controller: MySQLController = MySQLController(dockerClient)(hostPort, rootPassword, databaseName = Some("test"))
2929

@@ -33,11 +33,9 @@ class MySQLControllerSpec extends AnyFreeSpec with DockerControllerSpecSupport w
3333
Map(
3434
controller -> WaitPredicateSetting(
3535
Duration.Inf,
36-
WaitPredicates.forListeningHostTcpPort(
37-
dockerHost,
38-
hostPort,
39-
(1 * testTimeFactor).seconds,
40-
Some((30 * testTimeFactor).seconds)
36+
WaitPredicates.forLogMessageByRegex(
37+
""".*MySQL init process done\. Ready for start up\.""".r,
38+
Some((1 * testTimeFactor).seconds)
4139
)
4240
)
4341
)

0 commit comments

Comments
 (0)