Uses clickhouse/clickhouse-server as Docker Image in ClickHouseProv…

…ider
testcontainers · Jan 21, 2025 · 1aad405 · 1aad405
1 parent 2707f31
commit 1aad405
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/modules/clickhouse/build.gradle b/modules/clickhouse/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 
     testImplementation project(':jdbc-test')
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.7.0', classifier: 'http')
+    testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.4.1'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation testFixtures(project(':r2dbc'))
     testRuntimeOnly(group: 'com.clickhouse', name: 'clickhouse-r2dbc', version: '0.7.0', classifier: 'http')

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
@@ -21,9 +21,9 @@
  */
 public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContainer> {
 
-    private static final String NAME = "clickhouse";
+    public static final String NAME = "clickhouse";
 
-    static final String CLICKHOUSE_CLICKHOUSE_SERVER = "clickhouse/clickhouse-server";
+    public static final String CLICKHOUSE_CLICKHOUSE_SERVER = "clickhouse/clickhouse-server";
 
     private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse(CLICKHOUSE_CLICKHOUSE_SERVER);
 

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseProvider.java
@@ -1,5 +1,6 @@
 package org.testcontainers.containers;
 
+import org.testcontainers.clickhouse.ClickHouseContainer;
 import org.testcontainers.utility.DockerImageName;
 
 public class ClickHouseProvider extends JdbcDatabaseContainerProvider {
@@ -11,6 +12,6 @@ public boolean supports(String databaseType) {
 
     @Override
     public JdbcDatabaseContainer newInstance(String tag) {
-        return new ClickHouseContainer(DockerImageName.parse(ClickHouseContainer.IMAGE).withTag(tag));
+        return new ClickHouseContainer(DockerImageName.parse(ClickHouseContainer.CLICKHOUSE_CLICKHOUSE_SERVER).withTag(tag));
     }
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java b/modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
@@ -3,5 +3,5 @@
 import org.testcontainers.utility.DockerImageName;
 
 public interface ClickhouseTestImages {
-    DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.9.2-alpine");
+    DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:24.8.12.28");
 }
diff --git a/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java b/modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
@@ -12,7 +12,7 @@ public class ClickHouseContainerTest extends AbstractContainerDatabaseTest {
 
     @Test
     public void testSimple() throws SQLException {
-        try (ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")) {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:24.8.12.28")) {
             clickhouse.start();
 
             ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
@@ -25,7 +25,7 @@ public void testSimple() throws SQLException {
     @Test
     public void customCredentialsWithUrlParams() throws SQLException {
         try (
-            ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")
+            ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:24.8.12.28")
                 .withUsername("test")
                 .withPassword("test")
                 .withDatabaseName("test")

diff --git a/...use/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java b/...use/src/test/java/org/testcontainers/clickhouse/ClickHouseR2DBCDatabaseContainerTest.java
@@ -12,11 +12,11 @@ protected ConnectionFactoryOptions getOptions(ClickHouseContainer container) {
 
     @Override
     protected String createR2DBCUrl() {
-        return "r2dbc:tc:clickhouse:///db?TC_IMAGE_TAG=21.9.2-alpine";
+        return "r2dbc:tc:clickhouse:///db?TC_IMAGE_TAG=24.8.12.28";
     }
 
     @Override
     protected ClickHouseContainer createContainer() {
-        return new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine");
+        return new ClickHouseContainer("clickhouse/clickhouse-server:24.8.12.28");
     }
 }
diff --git a/...es/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java b/...es/clickhouse/src/test/java/org/testcontainers/junit/clickhouse/SimpleClickhouseTest.java
@@ -4,7 +4,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.testcontainers.ClickhouseTestImages;
-import org.testcontainers.containers.ClickHouseContainer;
+import org.testcontainers.clickhouse.ClickHouseContainer;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 import org.testcontainers.utility.DockerImageName;