Prepare for multiple engine types

* Use K8s pause container as default engine
* Include mounts for K0s, K3s and KubeSolo

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/cli.go

@@ -128,13 +128,6 @@ func Main() {
 			SkipFlagParsing: true,
 			Action:          udevSettleAction,
 		},
-		{
-			Name:            "user-docker",
-			Hidden:          true,
-			HideHelp:        true,
-			SkipFlagParsing: true,
-			Action:          userDockerAction,
-		},
 		installCommand,
 	}
 

cmd/control/console_init.go

@@ -15,7 +15,6 @@ import (
 	"github.com/burmilla/os/cmd/cloudinitexecute"
 	"github.com/burmilla/os/config"
 	"github.com/burmilla/os/config/cmdline"
-	"github.com/burmilla/os/pkg/compose"
 	"github.com/burmilla/os/pkg/log"
 	"github.com/burmilla/os/pkg/util"
 
@@ -182,27 +181,6 @@ $(tput sgr0)
 		log.Error(err)
 	}
 
-	p, err := compose.GetProject(cfg, false, true)
-	if err != nil {
-		log.Error(err)
-	}
-
-	// check the multi engine service & generate the multi engine script
-	for _, key := range p.ServiceConfigs.Keys() {
-		serviceConfig, ok := p.ServiceConfigs.Get(key)
-		if !ok {
-			log.Errorf("Failed to get service config from the project")
-			continue
-		}
-		if _, ok := serviceConfig.Labels[config.UserDockerLabel]; ok {
-			err = util.GenerateDindEngineScript(serviceConfig.Labels[config.UserDockerLabel])
-			if err != nil {
-				log.Errorf("Failed to generate engine script: %v", err)
-				continue
-			}
-		}
-	}
-
 	// create Docker CLI plugins folder
 	if _, err := os.Stat("/usr/libexec/docker/cli-plugins"); os.IsNotExist(err) {
 		if err = os.MkdirAll("/usr/libexec/docker/cli-plugins", 0755); err != nil {
@@ -290,17 +268,6 @@ $(tput sgr0)
 		log.Error(err)
 	}
 
-	// Check if user Docker has ever run in this installation yet and switch to latest 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")
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-		if err := cmd.Run(); err != nil {
-			log.Error(err)
-		}
-	}
-
 	if err := util.RunScript("/etc/rc.local"); err != nil {
 		log.Error(err)
 	}

cmd/control/docker_init.go

@@ -9,7 +9,6 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/burmilla/os/config"
 	"github.com/burmilla/os/pkg/log"
 	"github.com/burmilla/os/pkg/util"
 
@@ -74,19 +73,6 @@ func dockerInitAction(c *cli.Context) error {
 		log.Error(err)
 	}
 
-	mountInfo, err := ioutil.ReadFile("/proc/self/mountinfo")
-	if err != nil {
-		return err
-	}
-
-	for _, mount := range strings.Split(string(mountInfo), "\n") {
-		if strings.Contains(mount, "/var/lib/user-docker /var/lib/docker") && strings.Contains(mount, "rootfs") {
-			os.Setenv("DOCKER_RAMDISK", "true")
-		}
-	}
-
-	cfg := config.LoadConfig()
-
 	for _, link := range symLinkEngineBinary() {
 		syscall.Unlink(link.newname)
 		if _, err := os.Stat(link.oldname); err == nil {
@@ -96,11 +82,6 @@ func dockerInitAction(c *cli.Context) error {
 		}
 	}
 
-	err = checkZfsBackingFS(cfg.Rancher.Docker.StorageDriver, cfg.Rancher.Docker.DataRoot)
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	args := []string{
 		"bash",
 		"-c",