Skip to content

Commit 45e8fad

Browse files
committed
Support new deployments with non-latest Docker version
1 parent 5ca635a commit 45e8fad

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

cmd/control/console_init.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,14 @@ $(tput sgr0)
290290
log.Error(err)
291291
}
292292

293-
// Check if user Docker has ever run in this installation yet and switch to latest version if not
293+
// Check if user Docker has ever run in this installation yet and switch to latest/user defined version if not
294294
if _, err := os.Stat("/var/lib/docker/engine-id"); os.IsNotExist(err) {
295-
log.Warn("User Docker does not exist, switching to latest version")
296-
cmd := exec.Command("/usr/bin/ros", "engine", "switch", "latest")
295+
dockerVersion := "latest"
296+
if cfg.Rancher.Docker.Engine != dockerVersion {
297+
dockerVersion = cfg.Rancher.Docker.Engine
298+
}
299+
log.Warn("User Docker does not exist, switching to " + dockerVersion)
300+
cmd := exec.Command("/usr/bin/ros", "engine", "switch", dockerVersion)
297301
cmd.Stdout = os.Stdout
298302
cmd.Stderr = os.Stderr
299303
if err := cmd.Run(); err != nil {

0 commit comments

Comments
 (0)