Use v3.0.x branch from os-services

Author: olljanat

Dockerfile.dapper

@@ -68,7 +68,7 @@ ARG KERNEL_URL_arm64=https://github.com/burmilla/os-kernel/releases/download/v${
 ARG BUILD_DOCKER_URL_amd64=https://download.docker.com/linux/static/stable/x86_64/docker-26.1.4.tgz
 ARG BUILD_DOCKER_URL_arm64=https://download.docker.com/linux/static/stable/aarch64/docker-26.1.4.tgz
 
-ARG OS_RELEASES_YML=https://raw.githubusercontent.com/burmilla/releases/v2.0.x
+ARG OS_RELEASES_YML=https://raw.githubusercontent.com/burmilla/releases/v3.0.x
 
 ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services
 ARG IMAGE_NAME=${OS_REPO}/os
@@ -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/engine.go

@@ -88,20 +88,20 @@ func engineSwitch(c *cli.Context) error {
 		log.Fatal(err)
 	}
 
-	if err = project.Stop(context.Background(), 10, "docker"); err != nil {
+	if err = project.Stop(context.Background(), 10, "engine"); err != nil {
 		log.Fatal(err)
 	}
 
-	if err = compose.LoadSpecialService(project, cfg, "docker", newEngine); err != nil {
+	if err = compose.LoadSpecialService(project, cfg, "engine", newEngine); err != nil {
 		log.Fatal(err)
 	}
 
-	if err = project.Up(context.Background(), options.Up{}, "docker"); err != nil {
+	if err = project.Up(context.Background(), options.Up{}, "engine"); err != nil {
 		log.Fatal(err)
 	}
 
-	if err := config.Set("rancher.docker.engine", newEngine); err != nil {
-		log.Errorf("Failed to update rancher.docker.engine: %v", err)
+	if err := config.Set("rancher.engine", newEngine); err != nil {
+		log.Errorf("Failed to update rancher.engine: %v", err)
 	}
 
 	return nil

os-config.tpl.yml

@@ -80,7 +80,7 @@ rancher:
     - configdrive:/media/config-2
   repositories:
     core:
-      url: {{.OS_SERVICES_REPO}}/v2.0.x
+      url: {{.OS_SERVICES_REPO}}/v3.0.x
   state:
     fstype: auto
     oem_fstype: auto
@@ -381,3 +381,4 @@ rancher:
     url: {{.OS_RELEASES_YML}}/releases{{.SUFFIX}}.yml
     image: {{.OS_REPO}}/os
     policy: download
+  engine: