-
Notifications
You must be signed in to change notification settings - Fork 562
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace localhost with empty to also work with IPv6 mapped ports in D…
…ocker
- Loading branch information
Miel Donkers
committed
Oct 5, 2022
1 parent
f5bf42e
commit cd0ac6d
Showing
2 changed files
with
9 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -155,9 +155,12 @@ func CreateClickHouseTestEnvironment(testSet string) (ClickHouseTestEnvironment, | |
Image: fmt.Sprintf("clickhouse/clickhouse-server:%s", GetClickHouseTestVersion()), | ||
Name: fmt.Sprintf("clickhouse-go-%s-%d", strings.ToLower(testSet), time.Now().UnixNano()), | ||
ExposedPorts: []string{"9000/tcp", "8123/tcp", "9440/tcp", "8443/tcp"}, | ||
WaitingFor: wait.ForAll(wait.ForLog("Ready for connections").WithStartupTimeout(time.Second*time.Duration(120)), wait.ForSQL("9000/tcp", "clickhouse", func(port nat.Port) string { | ||
return fmt.Sprintf("clickhouse://default:ClickHouse@localhost:%s", port.Port()) | ||
})).WithStartupTimeout(time.Second * time.Duration(120)), | ||
WaitingFor: wait.ForAll( | ||
wait.ForLog("Ready for connections").WithStartupTimeout(time.Second*time.Duration(120)), | ||
wait.ForSQL("9000/tcp", "clickhouse", func(port nat.Port) string { | ||
return fmt.Sprintf("clickhouse://default:[email protected]:%s", port.Port()) | ||
}), | ||
).WithStartupTimeout(time.Second * time.Duration(120)), | ||
Mounts: []testcontainers.ContainerMount{ | ||
testcontainers.BindMount(path.Join(basePath, "./resources/custom.xml"), "/etc/clickhouse-server/config.d/custom.xml"), | ||
testcontainers.BindMount(path.Join(basePath, "./resources/admin.xml"), "/etc/clickhouse-server/users.d/admin.xml"), | ||
|
@@ -185,7 +188,7 @@ func CreateClickHouseTestEnvironment(testSet string) (ClickHouseTestEnvironment, | |
HttpPort: hp.Int(), | ||
SslPort: sslPort.Int(), | ||
HttpsPort: hps.Int(), | ||
Host: "localhost", | ||
Host: "127.0.0.1", | ||
// we set this explicitly - note its also set in the /etc/clickhouse-server/users.d/admin.xml | ||
Username: "default", | ||
Password: "ClickHouse", | ||
|