Skip to content

Commit

Permalink
Merge branch 'main' into docker-credentials
Browse files Browse the repository at this point in the history
* main:
  chore(deps): bump github.com/compose-spec/compose-go from 1.9.0 to 1.11.0 in /modules/compose (testcontainers#865)
  chore(deps): bump github.com/docker deps from 23.0.0+incompatible to 23.0.1+incompatible (testcontainers#875)
  chore(deps): bump github.com/aws/aws-sdk-go libs in /modules/localstack (testcontainers#874)
  chore: simplify env vars for localstack module (testcontainers#873)
  chore: remove replace directive in modules (testcontainers#871)
  chore: bump testcontainers-go in Go modules (testcontainers#870)
  • Loading branch information
mdelapenya committed Feb 23, 2023
2 parents e67e8f7 + 572051a commit d0e2209
Show file tree
Hide file tree
Showing 42 changed files with 282 additions and 230 deletions.
129 changes: 90 additions & 39 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,59 +22,110 @@ Once the version file is correct in the repository:

BUMP_TYPE="major" ./scripts/release.sh

- The script will update the `go.mod` files for each Go modules and example modules under the examples and modules directories, updating the version of the testcontainers-go dependency to the recently created tag.
- The script will create a commit in the **main** branch.
- The script will push the git the main branch including the tags to the upstream repository, https://github.com/testcontainers/testcontainers-go

An example execution, with dry-run mode enabled:

```
$ ./scripts/release.sh
git tag v0.18.0
git tag examples/bigtable/v0.18.0
git tag examples/cockroachdb/v0.18.0
git tag examples/consul/v0.18.0
git tag examples/datastore/v0.18.0
git tag examples/firestore/v0.18.0
git tag examples/mongodb/v0.18.0
git tag examples/mysql/v0.18.0
git tag examples/nginx/v0.18.0
git tag examples/postgres/v0.18.0
git tag examples/pubsub/v0.18.0
git tag examples/pulsar/v0.18.0
git tag examples/redis/v0.18.0
git tag examples/spanner/v0.18.0
git tag examples/toxiproxy/v0.18.0
git tag modules/compose/v0.18.0
git tag modules/localstack/v0.18.0
git tag v0.19.0
git tag examples/bigtable/v0.19.0
git tag examples/cockroachdb/v0.19.0
git tag examples/consul/v0.19.0
git tag examples/datastore/v0.19.0
git tag examples/firestore/v0.19.0
git tag examples/mongodb/v0.19.0
git tag examples/mysql/v0.19.0
git tag examples/nginx/v0.19.0
git tag examples/postgres/v0.19.0
git tag examples/pubsub/v0.19.0
git tag examples/pulsar/v0.19.0
git tag examples/redis/v0.19.0
git tag examples/spanner/v0.19.0
git tag examples/toxiproxy/v0.19.0
git tag modules/compose/v0.19.0
git tag modules/localstack/v0.19.0
git stash
git checkout main
Producing a minor bump of the version, from v0.18.0 to 0.19.0
sed "s/const Version = ".*"/const Version = "0.19.0"/g" /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/internal/version.go > /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/internal/version.go.tmp
sed "s/const Version = ".*"/const Version = "0.20.0"/g" /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/internal/version.go > /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/internal/version.go.tmp
mv /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/internal/version.go.tmp /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/internal/version.go
sed "s/latest_version: .*/latest_version: v0.18.0/g" /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/mkdocs.yml > /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/mkdocs.yml.tmp
sed "s/latest_version: .*/latest_version: v0.19.0/g" /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/mkdocs.yml > /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/mkdocs.yml.tmp
mv /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/mkdocs.yml.tmp /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/mkdocs.yml
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/bigtable/go.mod > examples/bigtable/go.mod.tmp
mv examples/bigtable/go.mod.tmp examples/bigtable/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/cockroachdb/go.mod > examples/cockroachdb/go.mod.tmp
mv examples/cockroachdb/go.mod.tmp examples/cockroachdb/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/consul/go.mod > examples/consul/go.mod.tmp
mv examples/consul/go.mod.tmp examples/consul/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/datastore/go.mod > examples/datastore/go.mod.tmp
mv examples/datastore/go.mod.tmp examples/datastore/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/firestore/go.mod > examples/firestore/go.mod.tmp
mv examples/firestore/go.mod.tmp examples/firestore/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/mongodb/go.mod > examples/mongodb/go.mod.tmp
mv examples/mongodb/go.mod.tmp examples/mongodb/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/mysql/go.mod > examples/mysql/go.mod.tmp
mv examples/mysql/go.mod.tmp examples/mysql/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/nginx/go.mod > examples/nginx/go.mod.tmp
mv examples/nginx/go.mod.tmp examples/nginx/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/postgres/go.mod > examples/postgres/go.mod.tmp
mv examples/postgres/go.mod.tmp examples/postgres/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/pubsub/go.mod > examples/pubsub/go.mod.tmp
mv examples/pubsub/go.mod.tmp examples/pubsub/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/pulsar/go.mod > examples/pulsar/go.mod.tmp
mv examples/pulsar/go.mod.tmp examples/pulsar/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/redis/go.mod > examples/redis/go.mod.tmp
mv examples/redis/go.mod.tmp examples/redis/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/spanner/go.mod > examples/spanner/go.mod.tmp
mv examples/spanner/go.mod.tmp examples/spanner/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" examples/toxiproxy/go.mod > examples/toxiproxy/go.mod.tmp
mv examples/toxiproxy/go.mod.tmp examples/toxiproxy/go.mod
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
go mod tidy
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" modules/compose/go.mod > modules/compose/go.mod.tmp
mv modules/compose/go.mod.tmp modules/compose/go.mod
sed "s/testcontainers-go .*/testcontainers-go v0.19.0/g" modules/localstack/go.mod > modules/localstack/go.mod.tmp
mv modules/localstack/go.mod.tmp modules/localstack/go.mod
go mod tidy
go mod tidy
git add /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/internal/version.go
git add /Users/mdelapenya/sourcecode/src/github.com/testcontainers/testcontainers-go/mkdocs.yml
git commit -m chore: prepare for next minor development cycle (0.19.0)
git add examples/**/go.mod
git add modules/**/go.mod
git commit -m chore: prepare for next minor development cycle (0.20.0)
git push origin main --tags
git unstash
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/bigtable/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/cockroachdb/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/consul/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/datastore/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/firestore/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/mongodb/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/mysql/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/nginx/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/postgres/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/pubsub/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/pulsar/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/redis/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/spanner/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/toxiproxy/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/modules/compose/@v/v0.18.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/modules/localstack/@v/v0.18.0
git stash pop
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/bigtable/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/cockroachdb/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/consul/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/datastore/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/firestore/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/mongodb/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/mysql/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/nginx/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/postgres/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/pubsub/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/pulsar/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/redis/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/spanner/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/examples/toxiproxy/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/modules/compose/@v/v0.19.0
curl https://proxy.golang.org/github.com/testcontainers/testcontainers-go/modules/localstack/@v/v0.19.0
```

Right after that, you have to:
Expand Down
7 changes: 2 additions & 5 deletions examples/bigtable/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
cloud.google.com/go/bigtable v1.18.1
github.com/testcontainers/testcontainers-go v0.17.0
github.com/testcontainers/testcontainers-go v0.18.0
google.golang.org/api v0.110.0
google.golang.org/grpc v1.53.0
gotest.tools/gotestsum v1.9.0
Expand Down Expand Up @@ -70,7 +70,4 @@ require (
gotest.tools/v3 v3.4.0 // indirect
)

replace (
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
github.com/testcontainers/testcontainers-go => ../..
)
replace github.com/testcontainers/testcontainers-go => ../..
4 changes: 2 additions & 2 deletions examples/bigtable/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible h1:ieHXawdo9MXKnRkKuVWEfEN3PDQUqIjz/T8vMfIaHkM=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v23.0.0+incompatible h1:L6c28tNyqZ4/ub9AZC9d5QUuunoHHfEH4/Ue+h/E5nE=
github.com/docker/docker v23.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
Expand Down
7 changes: 2 additions & 5 deletions examples/cockroachdb/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ require (
github.com/google/uuid v1.3.0
github.com/jackc/pgx/v4 v4.18.0
github.com/stretchr/testify v1.8.1
github.com/testcontainers/testcontainers-go v0.17.0
github.com/testcontainers/testcontainers-go v0.18.0
gotest.tools/gotestsum v1.9.0
)

replace (
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
github.com/testcontainers/testcontainers-go => ../..
)
replace github.com/testcontainers/testcontainers-go => ../..

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions examples/cockroachdb/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible h1:ieHXawdo9MXKnRkKuVWEfEN3PDQUqIjz/T8vMfIaHkM=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v23.0.0+incompatible h1:L6c28tNyqZ4/ub9AZC9d5QUuunoHHfEH4/Ue+h/E5nE=
github.com/docker/docker v23.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
Expand Down
7 changes: 2 additions & 5 deletions examples/consul/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/hashicorp/consul/api v1.18.0
github.com/testcontainers/testcontainers-go v0.17.0
github.com/testcontainers/testcontainers-go v0.18.0
gotest.tools/gotestsum v1.9.0
)

Expand Down Expand Up @@ -58,7 +58,4 @@ require (
gotest.tools/v3 v3.4.0 // indirect
)

replace (
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
github.com/testcontainers/testcontainers-go => ../..
)
replace github.com/testcontainers/testcontainers-go => ../..
4 changes: 2 additions & 2 deletions examples/consul/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible h1:ieHXawdo9MXKnRkKuVWEfEN3PDQUqIjz/T8vMfIaHkM=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v23.0.0+incompatible h1:L6c28tNyqZ4/ub9AZC9d5QUuunoHHfEH4/Ue+h/E5nE=
github.com/docker/docker v23.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
Expand Down
7 changes: 2 additions & 5 deletions examples/datastore/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
cloud.google.com/go/datastore v1.10.0
github.com/testcontainers/testcontainers-go v0.17.0
github.com/testcontainers/testcontainers-go v0.18.0
google.golang.org/api v0.110.0
google.golang.org/grpc v1.53.0
gotest.tools/gotestsum v1.9.0
Expand Down Expand Up @@ -62,7 +62,4 @@ require (
gotest.tools/v3 v3.4.0 // indirect
)

replace (
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
github.com/testcontainers/testcontainers-go => ../..
)
replace github.com/testcontainers/testcontainers-go => ../..
4 changes: 2 additions & 2 deletions examples/datastore/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible h1:ieHXawdo9MXKnRkKuVWEfEN3PDQUqIjz/T8vMfIaHkM=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v23.0.0+incompatible h1:L6c28tNyqZ4/ub9AZC9d5QUuunoHHfEH4/Ue+h/E5nE=
github.com/docker/docker v23.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
Expand Down
7 changes: 2 additions & 5 deletions examples/firestore/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
cloud.google.com/go/firestore v1.9.0
github.com/testcontainers/testcontainers-go v0.17.0
github.com/testcontainers/testcontainers-go v0.18.0
google.golang.org/api v0.110.0
google.golang.org/grpc v1.53.0
gotest.tools/gotestsum v1.9.0
Expand Down Expand Up @@ -64,7 +64,4 @@ require (
gotest.tools/v3 v3.4.0 // indirect
)

replace (
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
github.com/testcontainers/testcontainers-go => ../..
)
replace github.com/testcontainers/testcontainers-go => ../..
4 changes: 2 additions & 2 deletions examples/firestore/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible h1:ieHXawdo9MXKnRkKuVWEfEN3PDQUqIjz/T8vMfIaHkM=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v23.0.0+incompatible h1:L6c28tNyqZ4/ub9AZC9d5QUuunoHHfEH4/Ue+h/E5nE=
github.com/docker/docker v23.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
Expand Down
7 changes: 2 additions & 5 deletions examples/mongodb/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/testcontainers/testcontainers-go/examples/mongodb
go 1.18

require (
github.com/testcontainers/testcontainers-go v0.17.0
github.com/testcontainers/testcontainers-go v0.18.0
go.mongodb.org/mongo-driver v1.11.2
gotest.tools/gotestsum v1.9.0
)
Expand Down Expand Up @@ -57,7 +57,4 @@ require (
gotest.tools/v3 v3.4.0 // indirect
)

replace (
github.com/docker/docker => github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible // 22.06 branch
github.com/testcontainers/testcontainers-go => ../..
)
replace github.com/testcontainers/testcontainers-go => ../..
4 changes: 2 additions & 2 deletions examples/mongodb/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ github.com/dnephin/pflag v1.0.7 h1:oxONGlWxhmUct0YzKTgrpQv9AUA1wtPBn7zuSjJqptk=
github.com/dnephin/pflag v1.0.7/go.mod h1:uxE91IoWURlOiTUIA8Mq5ZZkAv3dPUfZNaT80Zm7OQE=
github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible h1:ieHXawdo9MXKnRkKuVWEfEN3PDQUqIjz/T8vMfIaHkM=
github.com/docker/docker v20.10.3-0.20221013203545-33ab36d6b304+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v23.0.0+incompatible h1:L6c28tNyqZ4/ub9AZC9d5QUuunoHHfEH4/Ue+h/E5nE=
github.com/docker/docker v23.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
Expand Down
Loading

0 comments on commit d0e2209

Please sign in to comment.