add: checking multiple registries in config file

Signed-off-by: Lazar Slavković-Raco <[email protected]> # Conflicts: # cmd/podman/login.go # cmd/podman/logout.go
containers · Dec 24, 2024 · 5b6052e · 5b6052e
1 parent d3cd509
commit 5b6052e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/cmd/podman/login.go b/cmd/podman/login.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/common/pkg/completion"
+	"github.com/containers/image/v5/pkg/sysregistriesv2"
 	"github.com/containers/image/v5/types"
 	"github.com/containers/podman/v5/cmd/podman/common"
 	"github.com/containers/podman/v5/cmd/podman/registry"
@@ -98,7 +99,15 @@ func login(cmd *cobra.Command, args []string) error {
 	sysCtx := &types.SystemContext{
 		DockerInsecureSkipTLSVerify: skipTLS,
 	}
+<<<<<<< HEAD
 	common.SetRegistriesConfPath(sysCtx)
+=======
+	setRegistriesConfPath(sysCtx)
+	registriesFromFile, _ := sysregistriesv2.UnqualifiedSearchRegistries(sysCtx)
+	if len(registriesFromFile) > 1 {
+		return errors.New("multiple registries in registry.conf, a registry must be provided")
+	}
+>>>>>>> 39123de11f (add: checking multiple registries in config file)
 	loginOptions.GetLoginSet = cmd.Flag("get-login").Changed
 	return auth.Login(context.Background(), sysCtx, &loginOptions.LoginOptions, args)
 }
diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go
@@ -1,10 +1,12 @@
 package main
 
 import (
+	"errors"
 	"os"
 
 	"github.com/containers/common/pkg/auth"
 	"github.com/containers/common/pkg/completion"
+	"github.com/containers/image/v5/pkg/sysregistriesv2"
 	"github.com/containers/image/v5/types"
 	"github.com/containers/podman/v5/cmd/podman/common"
 	"github.com/containers/podman/v5/cmd/podman/registry"
@@ -49,6 +51,14 @@ func init() {
 // Implementation of podman-logout.
 func logout(cmd *cobra.Command, args []string) error {
 	sysCtx := &types.SystemContext{}
+<<<<<<< HEAD
 	common.SetRegistriesConfPath(sysCtx)
+=======
+	setRegistriesConfPath(sysCtx)
+	registriesFromFile, _ := sysregistriesv2.UnqualifiedSearchRegistries(sysCtx)
+	if len(registriesFromFile) > 1 {
+		return errors.New("multiple registries in registry.conf, a registry must be provided")
+	}
+>>>>>>> 39123de11f (add: checking multiple registries in config file)
 	return auth.Logout(sysCtx, &logoutOptions, args)
 }