rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-11 03:22:49 +00:00
Code Issues Releases Wiki Activity

Fix display problem with ros engine list

Browse Source
This commit is contained in:
niusmallnan 2019-08-14 15:43:17 +08:00 committed by niusmallnan
parent eccf9554c8
commit 1893c7863b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.dapper
View File

@ -86,7 +86,7 @@ ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases
ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
ARG USER_DOCKER_VERSION=18.09.8 ARG USER_DOCKER_VERSION=18.09.8
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}-ce ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}
ARG AZURE_SERVICE=false ARG AZURE_SERVICE=false
ARG PROXMOXVE_SERVICE=false ARG PROXMOXVE_SERVICE=false

11
cmd/control/engine.go
View File

@ -18,6 +18,7 @@ import (
"github.com/rancher/os/pkg/log" "github.com/rancher/os/pkg/log"
"github.com/rancher/os/pkg/util" "github.com/rancher/os/pkg/util"
"github.com/rancher/os/pkg/util/network" "github.com/rancher/os/pkg/util/network"
"github.com/rancher/os/pkg/util/versions"
yaml "github.com/cloudfoundry-incubator/candiedyaml" yaml "github.com/cloudfoundry-incubator/candiedyaml"
"github.com/codegangsta/cli" "github.com/codegangsta/cli"
@ -364,8 +365,14 @@ func CurrentEngine() (engine string) {
} }
if t, ok := image.(reference.NamedTagged); ok { if t, ok := image.(reference.NamedTagged); ok {
tag := t.Tag() tag := t.Tag()
if !strings.HasPrefix(tag, "1.") {
// TODO: this assumes we only do Docker ce :/ // compatible with some patch image tags, such as 17.12.1-1,17.06.2-1,...
tag = strings.SplitN(tag, "-", 2)[0]
if !strings.HasPrefix(tag, "1.") && versions.LessThan(tag, "18.09.0") {
// >= 18.09.0, docker-<version>
// < 18.09.0 and >= 16.03, docker-<version>-ce
// < 17.03, docker-<version>
tag = tag + "-ce" tag = tag + "-ce"
} }
return "docker-" + tag return "docker-" + tag