Skip to content
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

Jump to bottom

Add clickhouse/clickhouse-server compatibility #5488

Merged
merged 6 commits into from
Jun 22, 2022
Merged

Add clickhouse/clickhouse-server compatibility #5488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ddfd62
Add clickhouse/clickhouse-server compatibility
eddumelendez Jun 13, 2022
0bf0f14
Merge branch 'master' into clickhouse_new_image
eddumelendez Jun 13, 2022
3d66ddc
Merge branch 'master' into clickhouse_new_image
eddumelendez Jun 15, 2022
876f0f4
Merge branch 'master' into clickhouse_new_image
eddumelendez Jun 16, 2022
4d4563e
Merge branch 'master' into clickhouse_new_image
eddumelendez Jun 21, 2022
7e7f4e0
Merge branch 'master' into clickhouse_new_image
eddumelendez Jun 22, 2022
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
4 changes: 3 additions & 1 deletion modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public class ClickHouseContainer extends JdbcDatabaseContainer {

private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("yandex/clickhouse-server");

private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse("clickhouse/clickhouse-server");

@Deprecated
public static final String IMAGE = DEFAULT_IMAGE_NAME.getUnversionedPart();

Expand Down Expand Up @@ -49,7 +51,7 @@ public ClickHouseContainer(String dockerImageName) {

public ClickHouseContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME, CLICKHOUSE_IMAGE_NAME);

withExposedPorts(HTTP_PORT, NATIVE_PORT);
waitingFor(
Expand Down
3 changes: 2 additions & 1 deletion modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
import org.testcontainers.utility.DockerImageName;

public interface ClickhouseTestImages {
DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("yandex/clickhouse-server:18.10.3");
DockerImageName YANDEX_CLICKHOUSE_IMAGE = DockerImageName.parse("yandex/clickhouse-server:18.10.3");
DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.9.2-alpine");
}
20 changes: 19 additions & 1 deletion ...es/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,38 @@
package org.testcontainers.junit.clickhouse;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.testcontainers.ClickhouseTestImages;
import org.testcontainers.containers.ClickHouseContainer;
import org.testcontainers.db.AbstractContainerDatabaseTest;
import org.testcontainers.utility.DockerImageName;

import java.sql.ResultSet;
import java.sql.SQLException;

import static org.rnorth.visibleassertions.VisibleAssertions.assertEquals;

@RunWith(Parameterized.class)
public class SimpleClickhouseTest extends AbstractContainerDatabaseTest {

private final DockerImageName imageName;

public SimpleClickhouseTest(DockerImageName imageName) {
this.imageName = imageName;
}

@Parameterized.Parameters(name = "{0}")
public static Object[][] data() {
return new Object[][] { //
{ ClickhouseTestImages.CLICKHOUSE_IMAGE },
{ ClickhouseTestImages.YANDEX_CLICKHOUSE_IMAGE },
};
}

@Test
public void testSimple() throws SQLException {
try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_IMAGE)) {
try (ClickHouseContainer clickhouse = new ClickHouseContainer(this.imageName)) {
clickhouse.start();

ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
Expand Down