rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

Make it easier to switch between Docker engines

Browse Source
This commit is contained in:
Josh Curl
2016-08-15 15:06:26 -07:00
parent 64711f9e66
commit 80c72d0761
23 changed files with 339 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper generated vendored
View File

@@ -30,7 +30,7 @@ RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0
wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_arm64.tar.gz
ENV DOCKER_VERSION=1.11.2 DOCKER_PATCH_VERSION=v1.11.2-ros1
ENV VERSION=v${DOCKER_VERSION}
ENV VERSION=v${DOCKER_VERSION}-2
RUN wget -O docker-${DOCKER_VERSION}_amd64.tgz -L https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz && \
wget -L https://github.com/rancher/docker/releases/download/${DOCKER_PATCH_VERSION}/docker-${DOCKER_VERSION}_arm.tgz && \

10
vendor/github.com/rancher/docker-from-scratch/scratch.go generated vendored
View File

@@ -108,9 +108,9 @@ func mountCgroups(hierarchyConfig map[string]string) error {
for scanner.Scan() {
text := scanner.Text()
log.Debugf("/proc/cgroups: %s", text)
fields := strings.SplitN(text, "\t", 3)
fields := strings.Split(text, "\t")
cgroup := fields[0]
if cgroup == "" || cgroup[0] == '#' || len(fields) < 3 || cgroup[2] == '0' {
if cgroup == "" || cgroup[0] == '#' || (len(fields) > 3 && fields[3] == "0") {
continue
}
@@ -661,11 +661,15 @@ func runOrExec(config *Config, docker string, args ...string) (*exec.Cmd, error)
return nil, err
}
cmd := "docker"
cmd := path.Base(docker)
if config != nil && config.CommandName != "" {
cmd = config.CommandName
}
if cmd == "dockerd" && len(args) > 1 && args[0] == "daemon" {
args = args[1:]
}
return execDocker(config, docker, cmd, args)
}