Skip to content

Commit 999ac16

Browse files
mdelapenyamdelapenya
committed
Merge branch 'main' into sshd-port-forwarding
* main: fix: don't retry on permanent APIClient errors (testcontainers#2506) feat: support overriding the default recreate options for compose (testcontainers#2511) feat: support passing io.Reader for compose files when creating a compose instance (testcontainers#2509) chore: add funding button for testcontainers (testcontainers#2510) feat: support Ryuk for the compose module (testcontainers#2485) chore(deps): bump golang.org/x/net in modules (minio, gcloud, weaviate, compose, qdrant, couchbase, k3s, milvus, mockserver, pulsar, kafka) (testcontainers#2505) fix: fallback to URL-path when parsing auth config URL without scheme (testcontainers#2488) fix(postgres): Fix the non-default dbname error (testcontainers#2489) feat: Bump default postgres version (testcontainers#2481) support Dolt (testcontainers#2177) chore: create TLS certs in a consistent manner (testcontainers#2478) chore(deps): bump idna from 3.6 to 3.7 (testcontainers#2480) Elasticsearch disable CA retrieval when ssl is disabled (testcontainers#2475) fix: handle dockerignore exclusions properly (testcontainers#2476)
2 parents 13a3c6b + ab60437 commit 999ac16

File tree

37 files changed

+1
-41
lines changed

37 files changed

+1
-41
lines changed

‎examples/nginx/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ require (
5151
golang.org/x/crypto v0.22.0 // indirect
5252
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5353
golang.org/x/mod v0.16.0 // indirect
54-
golang.org/x/sync v0.3.0 // indirect
5554
golang.org/x/sys v0.19.0 // indirect
5655
golang.org/x/tools v0.13.0 // indirect
5756
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎examples/toxiproxy/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ require (
5555
golang.org/x/crypto v0.22.0 // indirect
5656
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5757
golang.org/x/mod v0.16.0 // indirect
58-
golang.org/x/sync v0.3.0 // indirect
5958
golang.org/x/sys v0.19.0 // indirect
6059
golang.org/x/tools v0.13.0 // indirect
6160
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ require (
1919
github.com/stretchr/testify v1.9.0
2020
golang.org/x/crypto v0.22.0
2121
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea
22-
golang.org/x/sync v0.3.0
2322
golang.org/x/sys v0.19.0
2423
)
2524

‎modules/artemis/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ require (
5555
golang.org/x/crypto v0.22.0 // indirect
5656
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5757
golang.org/x/mod v0.16.0 // indirect
58-
golang.org/x/sync v0.3.0 // indirect
5958
golang.org/x/sys v0.19.0 // indirect
6059
golang.org/x/tools v0.13.0 // indirect
6160
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/cassandra/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ require (
5757
golang.org/x/crypto v0.22.0 // indirect
5858
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5959
golang.org/x/mod v0.16.0 // indirect
60-
golang.org/x/sync v0.3.0 // indirect
6160
golang.org/x/sys v0.19.0 // indirect
6261
golang.org/x/tools v0.13.0 // indirect
6362
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/chroma/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ require (
5858
golang.org/x/crypto v0.22.0 // indirect
5959
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
6060
golang.org/x/mod v0.16.0 // indirect
61-
golang.org/x/sync v0.3.0 // indirect
6261
golang.org/x/sys v0.19.0 // indirect
6362
golang.org/x/tools v0.13.0 // indirect
6463
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/clickhouse/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ require (
6363
golang.org/x/crypto v0.22.0 // indirect
6464
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
6565
golang.org/x/mod v0.16.0 // indirect
66-
golang.org/x/sync v0.6.0 // indirect
6766
golang.org/x/sys v0.19.0 // indirect
6867
golang.org/x/tools v0.14.0 // indirect
6968
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/consul/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ require (
6969
golang.org/x/crypto v0.22.0 // indirect
7070
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
7171
golang.org/x/mod v0.16.0 // indirect
72-
golang.org/x/sync v0.3.0 // indirect
7372
golang.org/x/sys v0.19.0 // indirect
7473
golang.org/x/tools v0.13.0 // indirect
7574
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/couchbase/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ require (
6666
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
6767
golang.org/x/mod v0.16.0 // indirect
6868
golang.org/x/net v0.23.0 // indirect
69-
golang.org/x/sync v0.5.0 // indirect
7069
golang.org/x/sys v0.19.0 // indirect
7170
golang.org/x/text v0.14.0 // indirect
7271
golang.org/x/tools v0.13.0 // indirect

‎modules/dolt/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ require (
5252
golang.org/x/crypto v0.22.0 // indirect
5353
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5454
golang.org/x/mod v0.16.0 // indirect
55-
golang.org/x/sync v0.3.0 // indirect
5655
golang.org/x/sys v0.19.0 // indirect
5756
golang.org/x/tools v0.13.0 // indirect
5857
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/elasticsearch/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ require (
5757
go.opentelemetry.io/otel/trace v1.24.0 // indirect
5858
golang.org/x/crypto v0.22.0 // indirect
5959
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
60-
golang.org/x/sync v0.3.0 // indirect
6160
golang.org/x/sys v0.19.0 // indirect
6261
golang.org/x/tools v0.13.0 // indirect
6362
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/inbucket/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ require (
5353
golang.org/x/crypto v0.22.0 // indirect
5454
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5555
golang.org/x/mod v0.16.0 // indirect
56-
golang.org/x/sync v0.3.0 // indirect
5756
golang.org/x/sys v0.19.0 // indirect
5857
golang.org/x/tools v0.13.0 // indirect
5958
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/influxdb/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ require (
5656
golang.org/x/crypto v0.22.0 // indirect
5757
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5858
golang.org/x/mod v0.16.0 // indirect
59-
golang.org/x/sync v0.3.0 // indirect
6059
golang.org/x/sys v0.19.0 // indirect
6160
golang.org/x/tools v0.13.0 // indirect
6261
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/k3s/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ require (
7272
golang.org/x/mod v0.16.0 // indirect
7373
golang.org/x/net v0.23.0 // indirect
7474
golang.org/x/oauth2 v0.10.0 // indirect
75-
golang.org/x/sync v0.5.0 // indirect
7675
golang.org/x/sys v0.19.0 // indirect
7776
golang.org/x/term v0.19.0 // indirect
7877
golang.org/x/text v0.14.0 // indirect

‎modules/k6/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ require (
5151
golang.org/x/crypto v0.22.0 // indirect
5252
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5353
golang.org/x/mod v0.16.0 // indirect
54-
golang.org/x/sync v0.3.0 // indirect
5554
golang.org/x/sys v0.19.0 // indirect
5655
golang.org/x/tools v0.13.0 // indirect
5756
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/kafka/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ require (
6868
golang.org/x/crypto v0.22.0 // indirect
6969
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
7070
golang.org/x/net v0.23.0 // indirect
71-
golang.org/x/sync v0.4.0 // indirect
7271
golang.org/x/sys v0.19.0 // indirect
7372
golang.org/x/tools v0.13.0 // indirect
7473
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/localstack/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ require (
7575
go.opentelemetry.io/otel/trace v1.24.0 // indirect
7676
golang.org/x/crypto v0.22.0 // indirect
7777
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
78-
golang.org/x/sync v0.6.0 // indirect
7978
golang.org/x/sys v0.19.0 // indirect
8079
golang.org/x/tools v0.19.0 // indirect
8180
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect

‎modules/mariadb/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ require (
5252
golang.org/x/crypto v0.22.0 // indirect
5353
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5454
golang.org/x/mod v0.16.0 // indirect
55-
golang.org/x/sync v0.3.0 // indirect
5655
golang.org/x/sys v0.19.0 // indirect
5756
golang.org/x/tools v0.13.0 // indirect
5857
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/milvus/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ require (
6565
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
6666
golang.org/x/mod v0.16.0 // indirect
6767
golang.org/x/net v0.23.0 // indirect
68-
golang.org/x/sync v0.3.0 // indirect
6968
golang.org/x/sys v0.19.0 // indirect
7069
golang.org/x/text v0.14.0 // indirect
7170
golang.org/x/tools v0.13.0 // indirect

‎modules/mockserver/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ require (
5454
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5555
golang.org/x/mod v0.16.0 // indirect
5656
golang.org/x/net v0.23.0 // indirect
57-
golang.org/x/sync v0.3.0 // indirect
5857
golang.org/x/sys v0.19.0 // indirect
5958
golang.org/x/tools v0.13.0 // indirect
6059
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/mssql/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ require (
5454
golang.org/x/crypto v0.22.0 // indirect
5555
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5656
golang.org/x/mod v0.16.0 // indirect
57-
golang.org/x/sync v0.3.0 // indirect
5857
golang.org/x/sys v0.19.0 // indirect
5958
golang.org/x/text v0.14.0 // indirect
6059
golang.org/x/tools v0.13.0 // indirect

‎modules/mysql/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ require (
5353
golang.org/x/crypto v0.22.0 // indirect
5454
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5555
golang.org/x/mod v0.16.0 // indirect
56-
golang.org/x/sync v0.3.0 // indirect
5756
golang.org/x/sys v0.19.0 // indirect
5857
golang.org/x/tools v0.13.0 // indirect
5958
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/nats/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ require (
5454
golang.org/x/crypto v0.22.0 // indirect
5555
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5656
golang.org/x/mod v0.16.0 // indirect
57-
golang.org/x/sync v0.3.0 // indirect
5857
golang.org/x/sys v0.19.0 // indirect
5958
golang.org/x/tools v0.13.0 // indirect
6059
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/neo4j/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ require (
5252
golang.org/x/crypto v0.22.0 // indirect
5353
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5454
golang.org/x/mod v0.16.0 // indirect
55-
golang.org/x/sync v0.3.0 // indirect
5655
golang.org/x/sys v0.19.0 // indirect
5756
golang.org/x/tools v0.13.0 // indirect
5857
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/ollama/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ require (
5454
golang.org/x/crypto v0.22.0 // indirect
5555
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
5656
golang.org/x/mod v0.16.0 // indirect
57-
golang.org/x/sync v0.5.0 // indirect
5857
golang.org/x/sys v0.19.0 // indirect
5958
golang.org/x/tools v0.14.0 // indirect
6059
google.golang.org/genproto/googleapis/rpc v0.0.0-20231211222908-989df2bf70f3 // indirect

‎modules/openldap/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ require (
5454
golang.org/x/crypto v0.22.0 // indirect
5555
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5656
golang.org/x/mod v0.16.0 // indirect
57-
golang.org/x/sync v0.3.0 // indirect
5857
golang.org/x/sys v0.19.0 // indirect
5958
golang.org/x/tools v0.13.0 // indirect
6059
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/opensearch/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ require (
5151
golang.org/x/crypto v0.22.0 // indirect
5252
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5353
golang.org/x/mod v0.16.0 // indirect
54-
golang.org/x/sync v0.3.0 // indirect
5554
golang.org/x/sys v0.19.0 // indirect
5655
golang.org/x/tools v0.13.0 // indirect
5756
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/postgres/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ require (
6060
golang.org/x/crypto v0.22.0 // indirect
6161
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
6262
golang.org/x/mod v0.16.0 // indirect
63-
golang.org/x/sync v0.3.0 // indirect
6463
golang.org/x/sys v0.19.0 // indirect
6564
golang.org/x/text v0.14.0 // indirect
6665
golang.org/x/tools v0.13.0 // indirect

‎modules/pulsar/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ require (
8484
golang.org/x/mod v0.16.0 // indirect
8585
golang.org/x/net v0.23.0 // indirect
8686
golang.org/x/oauth2 v0.10.0 // indirect
87-
golang.org/x/sync v0.3.0 // indirect
8887
golang.org/x/sys v0.19.0 // indirect
8988
golang.org/x/term v0.19.0 // indirect
9089
golang.org/x/tools v0.13.0 // indirect

‎modules/qdrant/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ require (
5454
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5555
golang.org/x/mod v0.16.0 // indirect
5656
golang.org/x/net v0.23.0 // indirect
57-
golang.org/x/sync v0.6.0 // indirect
5857
golang.org/x/sys v0.19.0 // indirect
5958
golang.org/x/text v0.14.0 // indirect
6059
golang.org/x/tools v0.13.0 // indirect

‎modules/rabbitmq/go.mod

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ require (
88
github.com/testcontainers/testcontainers-go v0.30.0
99
)
1010

11-
require (
12-
golang.org/x/crypto v0.22.0 // indirect
13-
golang.org/x/sync v0.3.0 // indirect
14-
)
11+
require golang.org/x/crypto v0.22.0 // indirect
1512

1613
require (
1714
dario.cat/mergo v1.0.0 // indirect

‎modules/redis/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ require (
6161
golang.org/x/crypto v0.22.0 // indirect
6262
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
6363
golang.org/x/mod v0.16.0 // indirect
64-
golang.org/x/sync v0.3.0 // indirect
6564
golang.org/x/sys v0.19.0 // indirect
6665
golang.org/x/tools v0.13.0 // indirect
6766
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/redpanda/go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ require (
1111
golang.org/x/mod v0.16.0
1212
)
1313

14-
require golang.org/x/sync v0.3.0 // indirect
15-
1614
require (
1715
dario.cat/mergo v1.0.0 // indirect
1816
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect

‎modules/registry/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ require (
5151
golang.org/x/crypto v0.22.0 // indirect
5252
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5353
golang.org/x/mod v0.16.0 // indirect
54-
golang.org/x/sync v0.3.0 // indirect
5554
golang.org/x/sys v0.19.0 // indirect
5655
golang.org/x/tools v0.13.0 // indirect
5756
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/surrealdb/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ require (
5353
golang.org/x/crypto v0.22.0 // indirect
5454
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
5555
golang.org/x/mod v0.16.0 // indirect
56-
golang.org/x/sync v0.3.0 // indirect
5756
golang.org/x/sys v0.19.0 // indirect
5857
golang.org/x/tools v0.13.0 // indirect
5958
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect

‎modules/vault/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ require (
6565
golang.org/x/crypto v0.22.0 // indirect
6666
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
6767
golang.org/x/mod v0.16.0 // indirect
68-
golang.org/x/sync v0.3.0 // indirect
6968
golang.org/x/sys v0.19.0 // indirect
7069
golang.org/x/time v0.3.0 // indirect
7170
golang.org/x/tools v0.13.0 // indirect

‎modules/weaviate/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ require (
7373
golang.org/x/mod v0.16.0 // indirect
7474
golang.org/x/net v0.23.0 // indirect
7575
golang.org/x/oauth2 v0.16.0 // indirect
76-
golang.org/x/sync v0.6.0 // indirect
7776
golang.org/x/sys v0.19.0 // indirect
7877
golang.org/x/text v0.14.0 // indirect
7978
golang.org/x/tools v0.13.0 // indirect

0 commit comments

Comments
 (0)