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

Merge pull request #763 from imikushin/bump-docker

Browse Source 
bump to docker-1.10.1
This commit is contained in:
Ivan Mikushin 2016-02-15 14:29:18 -08:00
commit 96b52c6cad
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.conf
View File

@ -1,3 +1,3 @@
IMAGE_NAME=rancher/os
VERSION=v0.4.3-dev
DFS_IMAGE=rancher/docker:v1.10.0-1
DFS_IMAGE=rancher/docker:v1.10.1

2
build.conf.amd64
View File

@ -1,2 +1,2 @@
COMPILED_KERNEL_URL=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.2.0-28.33-rancher/linux-4.2.8-ckt3-rancher-x86.tar.gz
DOCKER_BINARY_URL=https://get.docker.com/builds/Linux/x86_64/docker-1.10.0
DOCKER_BINARY_URL=https://get.docker.com/builds/Linux/x86_64/docker-1.10.1

2
build.conf.arm
View File

@ -1 +1 @@
DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.10.0-ros_arm/docker-1.10.0
DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.10.1-ros_arm/docker-1.10.1

2
trash.yml
View File

@ -66,7 +66,7 @@ import:
version: 1349b37bd56f4f5ce2690b5b2c0f53f88a261c67
- package: github.com/rancher/docker-from-scratch
version: v1.10.0-1
version: v1.10.1
- package: github.com/rancher/netconf
version: d7d620ef4ea62a9d04b51c7b3d9dc83fe7ffaa1b

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

@ -20,9 +20,9 @@ WORKDIR ${DAPPER_SOURCE}/assets
RUN curl -OL https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.3.1/base-files_amd64.tar.gz
RUN curl -OL https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.3.1/base-files_arm.tar.gz
RUN curl -o ./docker_amd64 -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.0 && \
RUN curl -o ./docker_amd64 -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.1 && \
chmod +x ./docker_amd64
RUN curl -o ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.0-ros_arm/docker-1.10.0 && \
RUN curl -o ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.1-ros_arm/docker-1.10.1 && \
chmod +x ./docker_arm
WORKDIR ${DAPPER_SOURCE}