Skip to content

Commit 274d03b

Browse files
committed
feat(config): update test image references and adjust defaults for better portability
- Replaced hardcoded S3 and GCS emulator image URLs with updated references to `ghcr.io/openprojectx/dockerhub`. - Modified default `databaseHostPort` in `spring-bigdata-test.toml` to use random ports for improved flexibility. - Enabled `autoConfigureJavaExecTasks` in the Gradle plugin for streamlined task configuration. - Updated documentation and examples to reflect image URL changes and configuration adjustments.
1 parent fc1cf1f commit 274d03b

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

core/src/main/kotlin/org/openprojectx/bigdata/test/core/BigDataTestKitOptions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package org.openprojectx.bigdata.test.core
22

33
import org.testcontainers.containers.GenericContainer
44

5-
const val DEFAULT_LOCALSTACK_S3_IMAGE = "floci/floci:latest"
6-
const val DEFAULT_FAKE_GCS_IMAGE = "floci/floci-gcp:latest"
5+
const val DEFAULT_LOCALSTACK_S3_IMAGE = "ghcr.io/openprojectx/dockerhub/floci/floci:latest"
6+
const val DEFAULT_FAKE_GCS_IMAGE = "ghcr.io/openprojectx/dockerhub/floci/floci-gcp:latest"
77

88
data class BigDataTestKitOptions(
99
val kerberos: KerberosOptions = KerberosOptions(),

doc/user-guide.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ clouderaHmsMariadb = "ghcr.io/openprojectx/cloudera-hms:0.1.74-mariadb"
236236
kafka = "apache/kafka:4.1.2"
237237
schemaRegistry = "confluentinc/cp-schema-registry:7.8.0"
238238
kafkaUi = "ghcr.io/kafbat/kafka-ui:latest"
239-
localStackS3 = "floci/floci:latest"
240-
fakeGcs = "floci/floci-gcp:latest"
239+
localStackS3 = "ghcr.io/openprojectx/dockerhub/floci/floci:latest"
240+
fakeGcs = "ghcr.io/openprojectx/dockerhub/floci/floci-gcp:latest"
241241
----
242242

243243
Kafka and the open-source HMS database sidecar use typed Testcontainers classes instead of plain generic containers. When you override those images, `bigdata-test` marks the configured Kafka image as a compatible substitute for `apache/kafka`, PostgreSQL as a compatible substitute for `postgres`, and MySQL as a compatible substitute for `mysql`, so private mirrors or rebuilt images can still pass Testcontainers image checks.

example/spark/src/test/resources/spark-bigdata-test-common.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ clouderaHmsMariadb = "ghcr.io/openprojectx/cloudera-hms:0.1.74-mariadb"
99
kafka = "apache/kafka:4.1.2"
1010
schemaRegistry = "confluentinc/cp-schema-registry:7.8.0"
1111
kafkaUi = "ghcr.io/kafbat/kafka-ui:latest"
12-
localStackS3 = "floci/floci:latest"
13-
fakeGcs = "floci/floci-gcp:latest"
12+
localStackS3 = "ghcr.io/openprojectx/dockerhub/floci/floci:latest"
13+
fakeGcs = "ghcr.io/openprojectx/dockerhub/floci/floci-gcp:latest"
1414

1515
[services]
1616
hdfs = true

example/spring-gradle-plugin/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ dependencies {
4242
}
4343

4444
bigDataTest {
45+
autoConfigureJavaExecTasks.set(true)
4546
config.add("classpath:spring-bigdata-test.toml")
4647
extensionConfig.add("classpath:spring-bigdata-extensions.toml")
4748
extensionRuntime {

example/spring-gradle-plugin/src/main/resources/spring-bigdata-test.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ databaseName = "metastore"
2424
databaseUser = "hive"
2525
databasePassword = "hive"
2626
# Optional. 0 means Testcontainers picks a random host port for 3306.
27-
databaseHostPort = 3306
27+
databaseHostPort = 0
2828

2929

3030
[kerberos]
@@ -50,7 +50,7 @@ localHdfsSitePath = "build/bigdata-test/hadoop/hdfs-site.xml"
5050
hdfsDataNode = 9866
5151
#hdfsWeb = 9870
5252
#localStackS3 = 4566
53-
hiveMetastore = 9083
53+
#hiveMetastore = 9083
5454

5555
[containerLogs]
5656
mode = "STDOUT"

0 commit comments

Comments
 (0)