Support new deployments with non-latest Docker version

Author: olljanat

Dockerfile.dapper

@@ -87,9 +87,6 @@ ARG SYSTEM_DOCKER_VERSION=17.06.107
 ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
 ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
 
-ARG USER_DOCKER_VERSION=latest
-ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
-
 ARG AZURE_SERVICE=false
 ARG PROXMOXVE_SERVICE=false
 ARG SKIP_BUILD=false
@@ -132,8 +129,6 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
     SYSTEM_DOCKER_URL=SYSTEM_DOCKER_URL_${ARCH} \
     SYSTEM_DOCKER_URL_amd64=${SYSTEM_DOCKER_URL_amd64} \
     SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64} \
-    USER_DOCKER_VERSION=${USER_DOCKER_VERSION} \
-    USER_DOCKER_ENGINE_VERSION=${USER_DOCKER_ENGINE_VERSION} \
     AZURE_SERVICE=${AZURE_SERVICE} \
     PROXMOXVE_SERVICE=${PROXMOXVE_SERVICE} \
     SKIP_BUILD=${SKIP_BUILD}

cmd/control/console_init.go

@@ -290,10 +290,14 @@ $(tput sgr0)
 		log.Error(err)
 	}
 
-	// Check if user Docker has ever run in this installation yet and switch to latest version if not
+	// Check if user Docker has ever run in this installation yet and switch to latest/user defined version if not
 	if _, err := os.Stat("/var/lib/docker/engine-id"); os.IsNotExist(err) {
-		log.Warn("User Docker does not exist, switching to latest version")
-		cmd := exec.Command("/usr/bin/ros", "engine", "switch", "latest")
+		dockerVersion := "latest"
+		if cfg.Rancher.Docker.Engine != dockerVersion {
+			dockerVersion = cfg.Rancher.Docker.Engine
+		}
+		log.Warn("User Docker does not exist, switching to " + dockerVersion)
+		cmd := exec.Command("/usr/bin/ros", "engine", "switch", dockerVersion)
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 		if err := cmd.Run(); err != nil {

os-config.tpl.yml

@@ -7,13 +7,8 @@ rancher:
     REGISTRY_DOMAIN: "docker.io"
   defaults:
     hostname: {{.HOSTNAME_DEFAULT}}
-    {{if eq "amd64" .ARCH -}}
-    docker:
-      engine: {{.USER_DOCKER_ENGINE_VERSION}}
-    {{else -}}
     docker:
-      engine: {{.USER_DOCKER_ENGINE_VERSION}}
-    {{end -}}
+      engine: latest
     network:
       dhcp_timeout: 10
       dns:
@@ -371,9 +366,9 @@ rancher:
       - system-volumes
     docker:
       {{if eq "amd64" .ARCH -}}
-      image: {{.OS_REPO}}/os-docker:{{.USER_DOCKER_VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-docker:latest
       {{else -}}
-      image: {{.OS_REPO}}/os-docker:{{.USER_DOCKER_VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-docker:latest
       {{end -}}
       command: ros user-docker
       environment:
@@ -414,11 +409,7 @@ rancher:
     image: {{.OS_REPO}}/os
     policy: download
   docker:
-    {{if eq "amd64" .ARCH -}}
-    engine: {{.USER_DOCKER_ENGINE_VERSION}}
-    {{else -}}
-    engine: {{.USER_DOCKER_ENGINE_VERSION}}
-    {{end -}}
+    engine: latest
     group: docker
     host: ["unix:///var/run/docker.sock"]
     log_opts: