Update testcontainers-go

t2bot · Dec 25, 2023 · 9f6681b · 9f6681b
1 parent 76ee0b7
commit 9f6681b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -56,8 +56,8 @@ require (
 	github.com/t2bot/go-typed-singleflight v0.0.3
 	github.com/t2bot/gotd-contrib v0.0.0-20230907202504-d21987ea2957
 	github.com/t2bot/pgo-fleet/embedded v1.0.1
-	github.com/testcontainers/testcontainers-go v0.26.0
-	github.com/testcontainers/testcontainers-go/modules/postgres v0.26.0
+	github.com/testcontainers/testcontainers-go v0.27.0
+	github.com/testcontainers/testcontainers-go/modules/postgres v0.27.0
 	golang.org/x/sync v0.5.0
 	golang.org/x/term v0.15.0
 )

diff --git a/go.sum b/go.sum
@@ -355,10 +355,10 @@ github.com/t2bot/pgo-fleet/embedded v1.0.1 h1:gRZFImsioKL/zFNIY1F8mlOc/bHBHFOj0o
 github.com/t2bot/pgo-fleet/embedded v1.0.1/go.mod h1:ShnCKRhA7Sy0tCzx3lUHTliE6fshiwJfqSbkLHe1rOU=
 github.com/tebeka/strftime v0.1.3 h1:5HQXOqWKYRFfNyBMNVc9z5+QzuBtIXy03psIhtdJYto=
 github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ=
-github.com/testcontainers/testcontainers-go v0.26.0 h1:uqcYdoOHBy1ca7gKODfBd9uTHVK3a7UL848z09MVZ0c=
-github.com/testcontainers/testcontainers-go v0.26.0/go.mod h1:ICriE9bLX5CLxL9OFQ2N+2N+f+803LNJ1utJb1+Inx0=
-github.com/testcontainers/testcontainers-go/modules/postgres v0.26.0 h1:I5UydATCgDjdOjhKy2ztjw3EhzKgug6xsVzmJ129+wQ=
-github.com/testcontainers/testcontainers-go/modules/postgres v0.26.0/go.mod h1:2p5a6shxPWQkSjErw6z5Sq/6DF1lMq7OnBX5R6EQrII=
+github.com/testcontainers/testcontainers-go v0.27.0 h1:IeIrJN4twonTDuMuBNQdKZ+K97yd7VrmNGu+lDpYcDk=
+github.com/testcontainers/testcontainers-go v0.27.0/go.mod h1:+HgYZcd17GshBUZv9b+jKFJ198heWPQq3KQIp2+N+7U=
+github.com/testcontainers/testcontainers-go/modules/postgres v0.27.0 h1:gbA/HYjBIwOwhE/t4p3kIprfI0qsxCk+YVW7P9XFOus=
+github.com/testcontainers/testcontainers-go/modules/postgres v0.27.0/go.mod h1:VFrFKUUgET2hNXStdtaC7uOIJWviFUrixhKeaVw/4F4=
 github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
 github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4=
 github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=

diff --git a/test/test_internals/deps.go b/test/test_internals/deps.go
@@ -80,8 +80,8 @@ func MakeTestDeps() (*ContainerDeps, error) {
 		ContainerRequest: testcontainers.ContainerRequest{
 			Image:        "docker.io/library/redis:7",
 			ExposedPorts: []string{"6379/tcp"},
-			Mounts: []testcontainers.ContainerMount{
-				testcontainers.BindMount(path.Join(cwd, ".", "dev", "redis.conf"), "/usr/local/etc/redis/redis.conf"),
+			Files: []testcontainers.ContainerFile{
+				{ContainerFilePath: "/usr/local/etc/redis/redis.conf", HostFilePath: path.Join(cwd, ".", "dev", "redis.conf")},
 			},
 			Cmd:        []string{"redis-server", "/usr/local/etc/redis/redis.conf"},
 			Networks:   []string{depNet.NetId},

diff --git a/test/test_internals/deps_minio.go b/test/test_internals/deps_minio.go
@@ -104,8 +104,8 @@ func MakeMinio(depNet *NetworkDep) (*MinioDep, error) {
 			Image:      "docker.io/alpine:3.18",
 			Networks:   []string{depNet.NetId},
 			WaitingFor: wait.ForLog("This line marks WaitFor as done").WithStartupTimeout(120 * time.Second),
-			Mounts: []testcontainers.ContainerMount{
-				testcontainers.BindMount(f.Name(), "/run.sh"),
+			Files: []testcontainers.ContainerFile{
+				{ContainerFilePath: "./run.sh", HostFilePath: f.Name()},
 			},
 			Cmd: []string{"ash", "-c", "chmod +x /run.sh && /run.sh"},
 		},

diff --git a/test/test_internals/deps_mmr.go b/test/test_internals/deps_mmr.go
@@ -95,8 +95,8 @@ func makeMmrInstances(ctx context.Context, count int, depNet *NetworkDep, tmplAr
 					KeepImage:      true,
 				},
 				ExposedPorts: []string{"8000/tcp"},
-				Mounts: []testcontainers.ContainerMount{
-					testcontainers.BindMount(intTmpName, "/data/media-repo.yaml"),
+				Files: []testcontainers.ContainerFile{
+					{ContainerFilePath: "/data/media-repo.yaml", HostFilePath: intTmpName},
 				},
 				Env: map[string]string{
 					"MACHINE_ID": strconv.Itoa(i),

diff --git a/test/test_internals/deps_synapse.go b/test/test_internals/deps_synapse.go
@@ -115,10 +115,10 @@ func MakeSynapse(domainName string, depNet *NetworkDep) (*SynapseDep, error) {
 		ContainerRequest: testcontainers.ContainerRequest{
 			Image:        "docker.io/matrixdotorg/synapse:v1.98.0",
 			ExposedPorts: []string{"8008/tcp"},
-			Mounts: []testcontainers.ContainerMount{
-				testcontainers.BindMount(f.Name(), "/data/homeserver.yaml"),
-				testcontainers.BindMount(path.Join(cwd, ".", "test", "templates", "synapse.log.config"), "/data/log.config"),
-				testcontainers.BindMount(d, "/app"),
+			Files: []testcontainers.ContainerFile{
+				{ContainerFilePath: "/data/homeserver.yaml", HostFilePath: f.Name()},
+				{ContainerFilePath: "/data/log.config", HostFilePath: path.Join(cwd, ".", "test", "templates", "synapse.log.config")},
+				{ContainerFilePath: "/app", HostFilePath: d},
 			},
 			WaitingFor: wait.ForHTTP("/health").WithPort(p),
 			Networks:   []string{depNet.NetId},