From 2f5c8c78f3451f9b262f20124cb553ede537a1d5 Mon Sep 17 00:00:00 2001 From: guangwu Date: Thu, 28 Sep 2023 15:50:27 +0800 Subject: [PATCH 1/2] fix: typo (#1696) Signed-off-by: guoguangwu --- docs/features/wait/multi.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/features/wait/multi.md b/docs/features/wait/multi.md index d8713d3864..62a2e26894 100644 --- a/docs/features/wait/multi.md +++ b/docs/features/wait/multi.md @@ -19,7 +19,7 @@ req := ContainerRequest{ wait.ForLog("port: 3306 MySQL Community Server - GPL"), // Timeout: 120s (from ForAll.WithStartupTimeoutDefault) wait.ForExposedPort().WithStartupTimeout(180*time.Second), // Timeout: 180s wait.ForListeningPort("3306/tcp").WithStartupTimeout(10*time.Second), // Timeout: 10s - ).WithStartupTimeoutDefault(120*time.Second). // Applies default StartupTimeout when not explictly defined + ).WithStartupTimeoutDefault(120*time.Second). // Applies default StartupTimeout when not explicitly defined WithDeadline(360*time.Second) // Applies deadline for all Wait Strategies } ``` From 906a8f4edf3a8d469cd4a1be5a346944b57576fc Mon Sep 17 00:00:00 2001 From: Geoff Flarity Date: Thu, 28 Sep 2023 03:51:32 -0400 Subject: [PATCH 2/2] get TestBuildContainerFromDockerfileWithDockerAuthConfig working on Mac Os (#1694) --- docker_auth_test.go | 12 ++++++------ testdata/auth.Dockerfile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker_auth_test.go b/docker_auth_test.go index 3274a9cb15..6563e9de34 100644 --- a/docker_auth_test.go +++ b/docker_auth_test.go @@ -158,7 +158,7 @@ func TestBuildContainerFromDockerfileWithDockerAuthConfig(t *testing.T) { base64 := "dGVzdHVzZXI6dGVzdHBhc3N3b3Jk" // testuser:testpassword t.Setenv("DOCKER_AUTH_CONFIG", `{ "auths": { - "localhost:5000": { "username": "testuser", "password": "testpassword", "auth": "`+base64+`" } + "localhost:5001": { "username": "testuser", "password": "testpassword", "auth": "`+base64+`" } }, "credsStore": "desktop" }`) @@ -187,7 +187,7 @@ func TestBuildContainerFromDockerfileShouldFailWithWrongDockerAuthConfig(t *test base64 := "Zm9vOmJhcg==" // foo:bar t.Setenv("DOCKER_AUTH_CONFIG", `{ "auths": { - "localhost:5000": { "username": "foo", "password": "bar", "auth": "`+base64+`" } + "localhost:5001": { "username": "foo", "password": "bar", "auth": "`+base64+`" } }, "credsStore": "desktop" }`) @@ -216,7 +216,7 @@ func TestCreateContainerFromPrivateRegistry(t *testing.T) { base64 := "dGVzdHVzZXI6dGVzdHBhc3N3b3Jk" // testuser:testpassword t.Setenv("DOCKER_AUTH_CONFIG", `{ "auths": { - "localhost:5000": { "username": "testuser", "password": "testpassword", "auth": "`+base64+`" } + "localhost:5001": { "username": "testuser", "password": "testpassword", "auth": "`+base64+`" } }, "credsStore": "desktop" }`) @@ -225,7 +225,7 @@ func TestCreateContainerFromPrivateRegistry(t *testing.T) { ctx := context.Background() req := ContainerRequest{ - Image: "localhost:5000/redis:5.0-alpine", + Image: "localhost:5001/redis:5.0-alpine", AlwaysPullImage: true, // make sure the authentication takes place ExposedPorts: []string{"6379/tcp"}, WaitingFor: wait.ForLog("Ready to accept connections"), @@ -246,7 +246,7 @@ func prepareLocalRegistryWithAuth(t *testing.T) { // bindMounts { req := ContainerRequest{ Image: "registry:2", - ExposedPorts: []string{"5000:5000/tcp"}, + ExposedPorts: []string{"5001:5000/tcp"}, Env: map[string]string{ "REGISTRY_AUTH": "htpasswd", "REGISTRY_AUTH_HTPASSWD_REALM": "Registry", @@ -281,7 +281,7 @@ func prepareLocalRegistryWithAuth(t *testing.T) { assert.NoError(t, err) t.Cleanup(func() { - removeImageFromLocalCache(t, "localhost:5000/redis:5.0-alpine") + removeImageFromLocalCache(t, "localhost:5001/redis:5.0-alpine") }) t.Cleanup(func() { assert.NoError(t, registryC.Terminate(context.Background())) diff --git a/testdata/auth.Dockerfile b/testdata/auth.Dockerfile index 270ae9d9e9..1f57898cba 100644 --- a/testdata/auth.Dockerfile +++ b/testdata/auth.Dockerfile @@ -1 +1 @@ -FROM localhost:5000/redis:5.0-alpine \ No newline at end of file +FROM localhost:5001/redis:5.0-alpine