Merge branch 'main' into container-exec-options

* main: fix(modules.kafka): Switch to MaxInt for 32-bit support (testcontainers#1923) docs: fix code snippet for image substitution (testcontainers#1918) Add database driver note to SQL Wait strategy docs (testcontainers#1916)
mdelapenya · Nov 17, 2023 · 9d92e69 · 9d92e69
2 parents f600e9e + 68d5f89
commit 9d92e69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/docs/features/image_name_substitution.md b/docs/features/image_name_substitution.md
@@ -5,6 +5,6 @@ An image name substitutor converts a Docker image name, as may be specified in c
 _Testcontainers for Go_ exposes an interface to perform this operations: `ImageSubstitutor`, and a No-operation implementation to be used as reference for custom implementations:
 
 <!--codeinclude-->
-[Image Substitutor Interface](../../generic.go) inside_block:imageSubstitutor
+[Image Substitutor Interface](../../options.go) inside_block:imageSubstitutor
 [Noop Image Substitutor](../../container_test.go) inside_block:noopImageSubstitutor
 <!--/codeinclude-->
diff --git a/docs/features/wait/sql.md b/docs/features/wait/sql.md
@@ -20,3 +20,5 @@ req := ContainerRequest{
         WithQuery("SELECT 10"),
 }
 ```
+
+Note: You'll also need to import the appropriate [database driver](https://github.com/golang/go/wiki/SQLDrivers) in your test code such that Testcontainers can pick it up when connecting to the database.
diff --git a/modules/kafka/kafka.go b/modules/kafka/kafka.go
@@ -52,7 +52,7 @@ func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomize
 			"KAFKA_OFFSETS_TOPIC_NUM_PARTITIONS":             "1",
 			"KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR": "1",
 			"KAFKA_TRANSACTION_STATE_LOG_MIN_ISR":            "1",
-			"KAFKA_LOG_FLUSH_INTERVAL_MESSAGES":              fmt.Sprintf("%d", math.MaxInt64),
+			"KAFKA_LOG_FLUSH_INTERVAL_MESSAGES":              fmt.Sprintf("%d", math.MaxInt),
 			"KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS":         "0",
 			"KAFKA_NODE_ID":                                  "1",
 			"KAFKA_PROCESS_ROLES":                            "broker,controller",