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

Make the user docker version as a build option

Browse Source
This commit is contained in:
niusmallnan 2018-12-04 14:48:09 +08:00
parent b32e8e37d2
commit 9812311a78
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile.dapper
View File

@ -82,6 +82,9 @@ ARG SYSTEM_DOCKER_VERSION=17.06-ros4
ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${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 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.06.1
ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION}-ce
ARG VMWARE_AUTOFORMAT=1 ARG VMWARE_AUTOFORMAT=1
###################################################### ######################################################
@ -118,6 +121,8 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
SYSTEM_DOCKER_URL=SYSTEM_DOCKER_URL_${ARCH} \ SYSTEM_DOCKER_URL=SYSTEM_DOCKER_URL_${ARCH} \
SYSTEM_DOCKER_URL_amd64=${SYSTEM_DOCKER_URL_amd64} \ SYSTEM_DOCKER_URL_amd64=${SYSTEM_DOCKER_URL_amd64} \
SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64} \ SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64} \
USER_DOCKER_VERSION=${USER_DOCKER_VERSION} \
USER_DOCKER_ENGINE_VERSION=${USER_DOCKER_ENGINE_VERSION} \
VMWARE_AUTOFORMAT=${VMWARE_AUTOFORMAT} VMWARE_AUTOFORMAT=${VMWARE_AUTOFORMAT}
ENV PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH ENV PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH

12
os-config.tpl.yml
View File

@ -8,10 +8,10 @@ rancher:
hostname: {{.HOSTNAME_DEFAULT}} hostname: {{.HOSTNAME_DEFAULT}}
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
docker: docker:
engine: docker-18.06.1-ce engine: {{.USER_DOCKER_ENGINE_VERSION}}
{{else -}} {{else -}}
docker: docker:
engine: docker-18.06.1-ce engine: {{.USER_DOCKER_ENGINE_VERSION}}
{{end -}} {{end -}}
network: network:
dhcp_timeout: 10 dhcp_timeout: 10
@ -349,9 +349,9 @@ rancher:
- system-volumes - system-volumes
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
image: {{.OS_REPO}}/os-docker:18.06.1{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:{{.USER_DOCKER_VERSION}}{{.SUFFIX}}
{{else -}} {{else -}}
image: {{.OS_REPO}}/os-docker:18.06.1{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:{{.USER_DOCKER_VERSION}}{{.SUFFIX}}
{{end -}} {{end -}}
command: ros user-docker command: ros user-docker
environment: environment:
@ -392,9 +392,9 @@ rancher:
image: {{.OS_REPO}}/os image: {{.OS_REPO}}/os
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
engine: docker-18.06.1-ce engine: {{.USER_DOCKER_ENGINE_VERSION}}
{{else -}} {{else -}}
engine: docker-18.06.1-ce engine: {{.USER_DOCKER_ENGINE_VERSION}}
{{end -}} {{end -}}
group: docker group: docker
host: ["unix:///var/run/docker.sock"] host: ["unix:///var/run/docker.sock"]