Skip to content

Commit 97cf9cb

Browse files
authored
Support to use docker registry for logging in (jfrog#151)
1 parent 38c5cd9 commit 97cf9cb

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

artifactory/commands/container/containermanagerbase.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const (
1616

1717
type ContainerCommandBase struct {
1818
image *container.Image
19+
loginRegistry string
1920
repo string
2021
buildConfiguration *build.BuildConfiguration
2122
serverDetails *config.ServerDetails
@@ -110,3 +111,12 @@ func (ccb *ContainerCommandBase) init() error {
110111
}
111112
return nil
112113
}
114+
115+
func (ccb *ContainerCommandBase) SetLoginRegistry(registry string) *ContainerCommandBase {
116+
ccb.loginRegistry = registry
117+
return ccb
118+
}
119+
120+
func (ccb *ContainerCommandBase) LoginRegistry() string {
121+
return ccb.loginRegistry
122+
}

artifactory/commands/container/containermanagercommand.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,15 @@ func (cm *ContainerCommand) PerformLogin(serverDetails *config.ServerDetails, co
4141
}
4242
}
4343
loginConfig := &container.ContainerManagerLoginConfig{ServerDetails: serverDetails}
44-
imageRegistry, err := cm.image.GetRegistry()
45-
if err != nil {
46-
return err
44+
var imageRegistry string
45+
if cm.LoginRegistry() != "" {
46+
imageRegistry = cm.LoginRegistry()
47+
} else {
48+
var err error
49+
imageRegistry, err = cm.image.GetRegistry()
50+
if err != nil {
51+
return err
52+
}
4753
}
4854
return container.ContainerManagerLogin(imageRegistry, loginConfig, containerManagerType)
4955
}

0 commit comments

Comments
 (0)