Skip to content

Feat/mysql oracle image compatibility #11767

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

Closed
haider2122 wants to merge 1 commit into from
+19 −2
Closed

Feat/mysql oracle image compatibility #11767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion modules/mysql/src/main/java/org/testcontainers/containers/MySQLContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ public class MySQLContainer<SELF extends MySQLContainer<SELF>> extends JdbcDatab

private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mysql");

private static final DockerImageName ORACLE_IMAGE_NAME =
DockerImageName.parse("container-registry.oracle.com/mysql/community-server");

@Deprecated
public static final String DEFAULT_TAG = "5.7.34";

Expand Down Expand Up @@ -58,7 +61,7 @@ public MySQLContainer(String dockerImageName) {

public MySQLContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, ORACLE_IMAGE_NAME);

addExposedPort(MYSQL_PORT);
}
Expand Down
4 changes: 3 additions & 1 deletion modules/mysql/src/main/java/org/testcontainers/mysql/MySQLContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ public class MySQLContainer extends JdbcDatabaseContainer<MySQLContainer> {
public static final String NAME = "mysql";

private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mysql");
private static final DockerImageName ORACLE_IMAGE_NAME =
DockerImageName.parse("container-registry.oracle.com/mysql/community-server");

static final String DEFAULT_USER = "test";

Expand All @@ -43,7 +45,7 @@ public MySQLContainer(String dockerImageName) {

public MySQLContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, ORACLE_IMAGE_NAME);

addExposedPort(MYSQL_PORT);
}
Expand Down
12 changes: 12 additions & 0 deletions modules/mysql/src/test/java/org/testcontainers/mysql/MySQLContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.testcontainers.containers.ContainerLaunchException;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.db.AbstractContainerDatabaseTest;
import org.testcontainers.utility.DockerImageName;

import java.io.File;
import java.net.URL;
Expand All @@ -28,6 +29,8 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.Assumptions.assumeThat;
import static org.assertj.core.api.Assertions.assertThatNoException;


class MySQLContainerTest extends AbstractContainerDatabaseTest {

Expand Down Expand Up @@ -270,6 +273,15 @@ void testCustom() throws SQLException {
}
}

@Test
void shouldAcceptOracleImageName() {
DockerImageName oracleImage = DockerImageName
.parse("container-registry.oracle.com/mysql/community-server:8.0");

assertThatNoException()
.isThrownBy(() -> new MySQLContainer(oracleImage));
}

private void assertHasCorrectExposedAndLivenessCheckPorts(MySQLContainer mysql) {
assertThat(mysql.getExposedPorts()).containsExactly(MySQLContainer.MYSQL_PORT);
assertThat(mysql.getLivenessCheckPortNumbers()).containsExactly(mysql.getMappedPort(MySQLContainer.MYSQL_PORT));
Expand Down
Loading