commit 5-2

Signed-off-by: jason yang <jasonyangshadow@gmail.com>
JasonYangShadow · Aug 29, 2024 · 23f848c · 23f848c
1 parent 0ad71d1
commit 23f848c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/e2e/actions/actions.go b/e2e/actions/actions.go
@@ -3082,6 +3082,15 @@ func (c actionTests) actionAuthTester(t *testing.T, withCustomAuthFile bool, pro
 
 	e2e.PrivateRepoLogin(t, c.env, profile, localAuthFileName)
 
+	c.env.RunApptainer(
+		t,
+		e2e.AsSubtest("docker pull"),
+		e2e.WithProfile(profile),
+		e2e.WithCommand("pull"),
+		e2e.WithArgs(append(authFileArgs, "--disable-cache", "--no-https", c.env.TestRegistryPrivImage)...),
+		e2e.ExpectExit(0),
+	)
+
 	c.env.RunApptainer(
 		t,
 		e2e.AsSubtest("docker"),

diff --git a/internal/pkg/util/ociauth/ociauth.go b/internal/pkg/util/ociauth/ociauth.go
@@ -58,7 +58,7 @@ func ChooseAuthFile(reqAuthFile string) string {
 		return reqAuthFile
 	}
 
-	return syfs.DockerConf()
+	return syfs.SearchDockerConf()
 }
 
 func LoginAndStore(registry, username, password string, insecure bool, reqAuthFile string) error {