rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-02 07:15:41 +00:00
Code Issues Releases Wiki Activity

Add docker-18.09.0

Browse Source
This commit is contained in:
Jason-ZW
2019-01-04 15:22:32 +08:00
committed by niusmallnan
parent 51642233b5
commit f30b6f4df2
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/control/console_init.go
View File

@@ -131,18 +131,7 @@ func consoleInitFunc() error {
} }
} }
baseSymlink := []symlink{ baseSymlink := symLinkEngineBinary(cfg.Rancher.Docker.Engine)
{"/var/lib/rancher/engine/docker", "/usr/bin/docker"},
{"/var/lib/rancher/engine/docker-init", "/usr/bin/docker-init"},
{"/var/lib/rancher/engine/docker-containerd", "/usr/bin/docker-containerd"},
{"/var/lib/rancher/engine/docker-containerd-ctr", "/usr/bin/docker-containerd-ctr"},
{"/var/lib/rancher/engine/docker-containerd-shim", "/usr/bin/docker-containerd-shim"},
{"/var/lib/rancher/engine/dockerd", "/usr/bin/dockerd"},
{"/var/lib/rancher/engine/docker-proxy", "/usr/bin/docker-proxy"},
{"/var/lib/rancher/engine/docker-runc", "/usr/bin/docker-runc"},
{"/usr/share/ros/os-release", "/usr/lib/os-release"},
{"/usr/share/ros/os-release", "/etc/os-release"},
}
if _, err := os.Stat(dockerCompletionFile); err == nil { if _, err := os.Stat(dockerCompletionFile); err == nil {
baseSymlink = append(baseSymlink, symlink{ baseSymlink = append(baseSymlink, symlink{

11
cmd/control/docker_init.go
View File

@@ -9,6 +9,7 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/rancher/os/config"
"github.com/rancher/os/pkg/log" "github.com/rancher/os/pkg/log"
"github.com/rancher/os/pkg/util" "github.com/rancher/os/pkg/util"
@@ -84,6 +85,16 @@ func dockerInitAction(c *cli.Context) error {
} }
} }
cfg := config.LoadConfig()
baseSymlink := symLinkEngineBinary(cfg.Rancher.Docker.Engine)
for _, link := range baseSymlink {
syscall.Unlink(link.newname)
if err := os.Symlink(link.oldname, link.newname); err != nil {
log.Error(err)
}
}
args := []string{ args := []string{
"bash", "bash",
"-c", "-c",

27
cmd/control/util.go
View File

@@ -28,3 +28,30 @@ func formatImage(image string, cfg *config.CloudConfig) string {
} }
return image return image
} }
func symLinkEngineBinary(version string) []symlink {
baseSymlink := []symlink{
{"/var/lib/rancher/engine/docker", "/usr/bin/docker"},
{"/var/lib/rancher/engine/dockerd", "/usr/bin/dockerd"},
{"/var/lib/rancher/engine/docker-init", "/usr/bin/docker-init"},
{"/var/lib/rancher/engine/docker-proxy", "/usr/bin/docker-proxy"},
{"/usr/share/ros/os-release", "/usr/lib/os-release"},
{"/usr/share/ros/os-release", "/etc/os-release"},
}
if strings.Contains(version, "18.09") {
baseSymlink = append(baseSymlink, []symlink{
{"/var/lib/rancher/engine/containerd", "/usr/bin/containerd"},
{"/var/lib/rancher/engine/ctr", "/usr/bin/ctr"},
{"/var/lib/rancher/engine/containerd-shim", "/usr/bin/containerd-shim"},
{"/var/lib/rancher/engine/runc", "/usr/bin/runc"},
}...)
} else {
baseSymlink = append(baseSymlink, []symlink{
{"/var/lib/rancher/engine/docker-containerd", "/usr/bin/docker-containerd"},
{"/var/lib/rancher/engine/docker-containerd-ctr", "/usr/bin/docker-containerd-ctr"},
{"/var/lib/rancher/engine/docker-containerd-shim", "/usr/bin/docker-containerd-shim"},
{"/var/lib/rancher/engine/docker-runc", "/usr/bin/docker-runc"},
}...)
}
return baseSymlink
}