Skip to content

Commit 94a0601

Browse files
nmohoricohaiwalt
authored andcommitted
Make sure auth is not used on circuit driver but is used when pulling in devMode (#85)
1 parent 6b221da commit 94a0601

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

relay/engines/docker.go

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ func (de *DockerEngine) IsAvailable(name string, meta string) (bool, error) {
6363
return true, nil
6464
}
6565
fullName := fmt.Sprintf("%s:%s", name, meta)
66-
err = de.attemptAuth()
66+
67+
// Circuit driver is always public, needs no auth
68+
if name != "operable/circuit-driver" {
69+
err = de.attemptAuth()
70+
}
6771
if err != nil {
6872
return false, err
6973
}
@@ -232,9 +236,19 @@ func (de *DockerEngine) attemptAuth() error {
232236

233237
func (de *DockerEngine) developerModeRefresh(bundle *config.Bundle) error {
234238
if de.relayConfig.DevMode == true {
239+
err := de.ensureConnected()
240+
if err != nil {
241+
return err
242+
}
235243
fullName := fmt.Sprintf("%s:%s", bundle.Docker.Image, bundle.Docker.Tag)
236244
log.Warnf("Developer mode: Refreshing Docker image %s.", fullName)
237-
err := de.pullImage(fullName)
245+
246+
err = de.attemptAuth()
247+
if err != nil {
248+
log.Errorf("Developer mode: Refresh of Docker image %s failed: %s.", fullName, err)
249+
return err
250+
}
251+
err = de.pullImage(fullName)
238252
if err != nil {
239253
log.Errorf("Developer mode: Refresh of Docker image %s failed: %s.", fullName, err)
240254
return err

0 commit comments

Comments
 (0)