Sitelet https://github.com/jasync-sql/jasync-sql/pull/357/files
Skip to content

Fix MySQL startup in Testcontainers #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oshai merged 2 commits into from
Jan 14, 2023
Merged

Fix MySQL startup in Testcontainers #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63bcef1
Fix MySQL startup in Testcontainers
KarboniteKream Jan 14, 2023
a0d66c5
Also update R2dbcContainerHelper
KarboniteKream Jan 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ db-async-common/out/*
mysql-async/out/*
postgresql-async/out/*
mysql-async/target/*
pool-async/target/*
postgis-jasync/target/*
.rvmrc
.ruby-version
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ JUNIT_VERSION=4.13.2
ASSERTJ_VERSION=3.23.1
MOCKK_VERSION=1.9
LOGBACK_VERSION=1.1.8
TEST_CONTAINERS_VERSION=1.15.1
TEST_CONTAINERS_VERSION=1.17.6
MYSQL_CONNECTOR_VERSION=5.1.47
AWAITILITY_VERSION=3.1.5
THREETEN_EXTRA=1.6.0
Expand Down
16 changes: 8 additions & 8 deletions mysql-async/src/test/java/com/github/jasync/sql/db/mysql/ContainerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class ContainerHelper {
private static final Logger logger = LoggerFactory.getLogger(ContainerHelper.class);

public static MySQLContainer mysql;
public static MySQLContainer<?> mysql;

public static Path domainSocketPath;

Expand Down Expand Up @@ -82,21 +82,21 @@ private static boolean isLocalMySQLRunning() {

private static void startMySQLDocker() throws IOException {
if (mysql == null) {
// MySQLContainer always sets the root password to be the same as the
// user password. For legacy reasons, we expect the root password to be
// different.
mysql = new MySQLContainer("mysql:5.7.32") {
@Override
protected void configure() {
super.configure();
// Make sure to do this after the call to `super` so these
// really do override the environment variables.
addEnv("MYSQL_DATABASE", "mysql_async_tests");
addEnv("MYSQL_USER", "mysql_async");
addEnv("MYSQL_PASSWORD", "root");
// MySQLContainer always sets the root password to be the same as the
// user password. For legacy reasons, we expect the root password to be
// different.
addEnv("MYSQL_ROOT_PASSWORD", "test");
}
};
}.withUsername("mysql_async")
.withPassword("root")
.withDatabaseName("mysql_async_tests");

for (String file : Arrays.asList("ca.pem", "server-key.pem", "server-cert.pem", "update-config.sh")) {
mysql.withClasspathResourceMapping(file, "/docker-entrypoint-initdb.d/" + file, BindMode.READ_ONLY);
}
Expand Down
16 changes: 8 additions & 8 deletions r2dbc-mysql/src/test/java/com/github/jasync/r2dbc/mysql/integ/R2dbcContainerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public class R2dbcContainerHelper {
private static final Logger logger = LoggerFactory.getLogger(R2dbcContainerHelper.class);

public static MySQLContainer mysql;
public static MySQLContainer<?> mysql;

public static Integer getPort() {
return defaultConfiguration.getPort();
Expand Down Expand Up @@ -60,21 +60,21 @@ private static boolean isLocalMySQLRunning() {

private static void startMySQLDocker() {
if (mysql == null) {
// MySQLContainer always sets the root password to be the same as the
// user password. For legacy reasons, we expect the root password to be
// different.
mysql = new MySQLContainer("mysql:5.7.32") {
@Override
protected void configure() {
super.configure();
// Make sure to do this after the call to `super` so these
// really do override the environment variables.
addEnv("MYSQL_DATABASE", "mysql_async_tests");
addEnv("MYSQL_USER", "mysql_async");
addEnv("MYSQL_PASSWORD", "root");
// MySQLContainer always sets the root password to be the same as the
// user password. For legacy reasons, we expect the root password to be
// different.
addEnv("MYSQL_ROOT_PASSWORD", "test");
}
};
}.withUsername("mysql_async")
.withPassword("root")
.withDatabaseName("mysql_async_tests");

for (String file : Arrays.asList("ca.pem", "server-key.pem", "server-cert.pem", "update-config.sh")) {
mysql.withClasspathResourceMapping(file, "/docker-entrypoint-initdb.d/" + file, BindMode.READ_ONLY);
}
Expand Down