diff --git a/build.conf b/build.conf index 9ed1edb4..d4d331d0 100644 --- a/build.conf +++ b/build.conf @@ -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 diff --git a/build.conf.amd64 b/build.conf.amd64 index 623e8004..96cb0a8b 100644 --- a/build.conf.amd64 +++ b/build.conf.amd64 @@ -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 diff --git a/build.conf.arm b/build.conf.arm index 0a2dacbb..4f45a6d0 100644 --- a/build.conf.arm +++ b/build.conf.arm @@ -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 diff --git a/trash.yml b/trash.yml index 5ac1a243..dd8b52a2 100644 --- a/trash.yml +++ b/trash.yml @@ -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 diff --git a/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper b/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper index e4a6a343..3894f875 100644 --- a/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper +++ b/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper @@ -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}