diff --git a/build.conf b/build.conf index a95db5f8..06d823ad 100644 --- a/build.conf +++ b/build.conf @@ -1,4 +1,4 @@ IMAGE_NAME=rancher/os VERSION=v0.4.4-dev -DFS_IMAGE=rancher/docker:v1.10.1 +DFS_IMAGE=rancher/docker:v1.10.2 SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.1/policy.29 diff --git a/build.conf.amd64 b/build.conf.amd64 index 96cb0a8b..bc92e52c 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.1 +DOCKER_BINARY_URL=https://get.docker.com/builds/Linux/x86_64/docker-1.10.2 diff --git a/build.conf.arm b/build.conf.arm index 4f45a6d0..9f64d3d8 100644 --- a/build.conf.arm +++ b/build.conf.arm @@ -1 +1 @@ -DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.10.1-ros_arm/docker-1.10.1 +DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.10.2-ros_arm/docker-1.10.2 diff --git a/trash.yml b/trash.yml index b499e802..4daae75d 100644 --- a/trash.yml +++ b/trash.yml @@ -66,7 +66,7 @@ import: version: 1349b37bd56f4f5ce2690b5b2c0f53f88a261c67 - package: github.com/rancher/docker-from-scratch - version: 62ceebcf43725e484e598b2879d1aa33b4a5133a + version: v1.10.2 - 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 a2e06377..b8e078d0 100644 --- a/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper +++ b/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper @@ -21,9 +21,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.1 && \ +RUN curl -o ./docker_amd64 -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.2 && \ chmod +x ./docker_amd64 -RUN curl -o ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.1-ros_arm/docker-1.10.1 && \ +RUN curl -o ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.2-ros_arm/docker-1.10.2 && \ chmod +x ./docker_arm WORKDIR ${DAPPER_SOURCE} diff --git a/vendor/github.com/rancher/docker-from-scratch/selinux/selinux.go b/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_amd64.go similarity index 100% rename from vendor/github.com/rancher/docker-from-scratch/selinux/selinux.go rename to vendor/github.com/rancher/docker-from-scratch/selinux/selinux_amd64.go diff --git a/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_arm.go b/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_arm.go new file mode 100644 index 00000000..9e305b33 --- /dev/null +++ b/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_arm.go @@ -0,0 +1,6 @@ +package selinux + +// SetFileContext is a stub for SELinux support on ARM +func SetFileContext(path string, context string) (int, error) { + return 0, nil +}