Fixed docker update pull race condition

* Prior would attempt to pull the existing image. * Changed to pull the new version
cisco-sso · Sep 24, 2018 · 91e8eb0 · 91e8eb0
1 parent 573cfe6
commit 91e8eb0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/kdk/pull.go b/pkg/kdk/pull.go
@@ -24,7 +24,12 @@ import (
 )
 
 func Pull(cfg *KdkEnvConfig) error {
-	out, err := cfg.DockerClient.ImagePull(cfg.Ctx, cfg.ImageCoordinates(), types.ImagePullOptions{})
+	return pullImage(cfg, cfg.ImageCoordinates())
+}
+
+func pullImage(cfg *KdkEnvConfig, imageCoordinates string) error {
+
+	out, err := cfg.DockerClient.ImagePull(cfg.Ctx, imageCoordinates, types.ImagePullOptions{})
 	if err != nil {
 		return err
 	}

diff --git a/pkg/kdk/update.go b/pkg/kdk/update.go
@@ -113,7 +113,7 @@ func Update(cfg *KdkEnvConfig) {
 
 	if needsUpdateImage(cfg) {
 		log.Info("Updating KDK image")
-		err := updateImage(cfg)
+		err := pullImage(cfg, cfg.ConfigFile.AppConfig.ImageRepository + ":" + latestReleaseVersion)
 		if err != nil {
 			log.WithField("error", err).Fatal("Failed to update KDK image")
 		}