Merge branch 'main' into include-dependabot-in-generator

* main: chore: format dependabot using go-yaml indents (testcontainers#658) chore(deps): bump github.com/docker/compose/v2 from 2.12.2 to 2.14.0 (testcontainers#657) chore(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (#583) chore(deps): bump github.com/cenkalti/backoff/v4 from 4.1.3 to 4.2.0 (testcontainers#656)
mdelapenya · Dec 5, 2022 · ee5df53 · ee5df53
2 parents a401b2d + e6dce39
commit ee5df53
Show file tree

Hide file tree

Showing 3 changed files with 100 additions and 216 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,68 +1,68 @@
 version: 2
 updates:
-- package-ecosystem: gomod
-  directory: /
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /e2e
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /examples/cockroachdb
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /examples/datastore
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /examples/firestore
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /examples/nginx
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /examples/pubsub
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /examples/pulsar
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /examples/redis
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /examples/spanner
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
-- package-ecosystem: gomod
-  directory: /examples/toxiproxy
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 3
-  rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /e2e
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /examples/cockroachdb
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /examples/datastore
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /examples/firestore
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /examples/nginx
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /examples/pubsub
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /examples/pulsar
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /examples/redis
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /examples/spanner
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /examples/toxiproxy
+      schedule:
+        interval: daily
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
diff --git a/go.mod b/go.mod
@@ -3,21 +3,21 @@ module github.com/testcontainers/testcontainers-go
 go 1.18
 
 require (
-	github.com/cenkalti/backoff/v4 v4.1.3
-	github.com/compose-spec/compose-go v1.6.0
+	github.com/cenkalti/backoff/v4 v4.2.0
+	github.com/compose-spec/compose-go v1.8.0
 	github.com/containerd/containerd v1.6.10
-	github.com/docker/cli v20.10.19+incompatible
-	github.com/docker/compose/v2 v2.12.2
-	github.com/docker/docker v20.10.19+incompatible
+	github.com/docker/cli v20.10.20+incompatible
+	github.com/docker/compose/v2 v2.14.0
+	github.com/docker/docker v20.10.20+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.5.0
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/google/uuid v1.3.0
 	github.com/magiconair/properties v1.8.6
-	github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae
-	github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1
-	github.com/stretchr/testify v1.8.0
+	github.com/moby/term v0.0.0-20221128092401-c43b287e0e0f
+	github.com/opencontainers/image-spec v1.1.0-rc2
+	github.com/stretchr/testify v1.8.1
 	golang.org/x/sync v0.1.0
 	golang.org/x/sys v0.3.0
 	golang.org/x/text v0.3.7
@@ -48,21 +48,19 @@ require (
 	github.com/Microsoft/go-winio v0.5.2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/buger/goterm v1.0.4 // indirect
-	github.com/bugsnag/bugsnag-go v1.5.0 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/cloudflare/cfssl v1.4.1 // indirect
 	github.com/containerd/cgroups v1.0.4 // indirect
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/containerd/continuity v0.3.0 // indirect
 	github.com/containerd/ttrpc v1.1.0 // indirect
 	github.com/containerd/typeurl v1.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/distribution/distribution/v3 v3.0.0-20220907155224-78b9c98c5c31 // indirect
+	github.com/distribution/distribution/v3 v3.0.0-20221201083218-92d136e113cf // indirect
 	github.com/dnephin/pflag v1.0.7 // indirect
 	github.com/docker/buildx v0.9.1 // indirect
 	github.com/docker/distribution v2.8.1+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.6.4 // indirect
+	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/fatih/color v1.13.0 // indirect
@@ -86,9 +84,10 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
 	github.com/inconshreveable/mousetrap v1.0.1 // indirect
-	github.com/jinzhu/gorm v1.9.11 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/compress v1.15.9 // indirect
@@ -122,9 +121,10 @@ require (
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/spf13/cobra v1.6.0 // indirect
+	github.com/spf13/cast v1.3.0 // indirect
+	github.com/spf13/cobra v1.6.1 // indirect
+	github.com/spf13/jwalterweatherman v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.4.0 // indirect
 	github.com/theupdateframework/notary v0.7.0 // indirect
 	github.com/tonistiigi/fsutil v0.0.0-20220930225714-4638ad635be5 // indirect
 	github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect