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

Support docker 19.03+

Browse Source
This commit is contained in:
niusmallnan
2019-08-02 14:57:53 +08:00
committed by niusmallnan
parent 0e22f6f06f
commit 7a5420e8bb
3 changed files with 91 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/control/util.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/rancher/os/config"
"github.com/rancher/os/pkg/log"
"github.com/rancher/os/pkg/util/versions"
"github.com/pkg/errors"
)
@@ -34,6 +35,7 @@ func formatImage(image string, cfg *config.CloudConfig) string {
}
func symLinkEngineBinary(version string) []symlink {
versionNum := strings.Replace(strings.Replace(version, "docker-", "", -1), "-ce", "", -1)
baseSymlink := []symlink{
{"/var/lib/rancher/engine/docker", "/usr/bin/docker"},
{"/var/lib/rancher/engine/dockerd", "/usr/bin/dockerd"},
@@ -42,7 +44,7 @@ func symLinkEngineBinary(version string) []symlink {
{"/usr/share/ros/os-release", "/usr/lib/os-release"},
{"/usr/share/ros/os-release", "/etc/os-release"},
}
if strings.Contains(version, "18.09") {
if versions.GreaterThanOrEqualTo(versionNum, "18.09.0") {
baseSymlink = append(baseSymlink, []symlink{
{"/var/lib/rancher/engine/containerd", "/usr/bin/containerd"},
{"/var/lib/rancher/engine/ctr", "/usr/bin/ctr"},