diff --git a/build.conf b/build.conf index 549f8149..e4b2b201 100644 --- a/build.conf +++ b/build.conf @@ -1,6 +1,6 @@ IMAGE_NAME=rancher/os VERSION=v0.4.4-dev -DFS_IMAGE=rancher/docker:v1.10.2 +DFS_IMAGE=rancher/docker:v1.10.2-1 SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.1/policy.29 HOSTNAME_DEFAULT=rancher diff --git a/trash.yml b/trash.yml index 4daae75d..3c86dc90 100644 --- a/trash.yml +++ b/trash.yml @@ -66,7 +66,7 @@ import: version: 1349b37bd56f4f5ce2690b5b2c0f53f88a261c67 - package: github.com/rancher/docker-from-scratch - version: v1.10.2 + version: v1.10.2-1 - package: github.com/rancher/netconf version: d7d620ef4ea62a9d04b51c7b3d9dc83fe7ffaa1b diff --git a/vendor/github.com/rancher/docker-from-scratch/.drone.yml b/vendor/github.com/rancher/docker-from-scratch/.drone.yml index 3719c182..6ddc20a4 100644 --- a/vendor/github.com/rancher/docker-from-scratch/.drone.yml +++ b/vendor/github.com/rancher/docker-from-scratch/.drone.yml @@ -1,5 +1,5 @@ build: - image: rancher/dapper:1.9.1 + image: rancher/dapper:1.10.2 volumes: - /var/run/docker.sock:/var/run/docker.sock commands: diff --git a/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper b/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper index b8e078d0..b5648a92 100644 --- a/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper +++ b/vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper @@ -1,13 +1,13 @@ -FROM golang:1.5.3 +FROM golang:1.6 RUN apt-get update && apt-get -y install libselinux-dev pkg-config -RUN curl -o /usr/local/bin/docker -L https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 && \ +RUN wget -O /usr/local/bin/docker -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.2 && \ chmod +x /usr/local/bin/docker ENV DAPPER_SOURCE /go/src/github.com/rancher/docker-from-scratch ENV DAPPER_OUTPUT "" ENV DAPPER_DOCKER_SOCKET true -ENV DAPPER_ENV NO_TEST +ENV DAPPER_ENV NO_TEST ARCH ENV GO15VENDOREXPERIMENT 1 @@ -18,21 +18,24 @@ WORKDIR ${DAPPER_SOURCE} RUN mkdir -p assets 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 wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_amd64.tar.gz +RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_arm.tar.gz +RUN wget https://github.com/rancher/docker-from-scratch/releases/download/bin-v0.4.0/base-files_arm64.tar.gz -RUN curl -o ./docker_amd64 -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.2 && \ +RUN wget -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.2-ros_arm/docker-1.10.2 && \ +RUN wget -O ./docker_arm -L https://github.com/rancher/docker/releases/download/v1.10.2-arm2/docker-1.10.2_arm && \ chmod +x ./docker_arm +RUN wget -O ./docker_arm64 -L https://github.com/rancher/docker/releases/download/v1.10.2-arm2/docker-1.10.2_arm64 && \ + chmod +x ./docker_arm64 WORKDIR ${DAPPER_SOURCE} COPY ./scripts/crosstools.list /etc/apt/sources.list.d/ RUN sh -c 'curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -' && \ - dpkg --add-architecture armhf && \ + dpkg --add-architecture armhf && dpkg --add-architecture arm64 && \ apt-get update && \ - apt-get install -y crossbuild-essential-armhf + apt-get install -y crossbuild-essential-armhf crossbuild-essential-arm64 CMD ./scripts/ci diff --git a/vendor/github.com/rancher/docker-from-scratch/scratch.go b/vendor/github.com/rancher/docker-from-scratch/scratch.go index 3a5ecf09..45d1be6c 100644 --- a/vendor/github.com/rancher/docker-from-scratch/scratch.go +++ b/vendor/github.com/rancher/docker-from-scratch/scratch.go @@ -453,7 +453,7 @@ func touchSockets(args ...string) error { } func createLayout(config *Config) error { - if err := createDirs("/tmp", "/root/.ssh", "/var"); err != nil { + if err := createDirs("/tmp", "/root/.ssh", "/var", "/usr/lib"); err != nil { return err } diff --git a/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_arm64.go b/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_arm64.go new file mode 100644 index 00000000..9e305b33 --- /dev/null +++ b/vendor/github.com/rancher/docker-from-scratch/selinux/selinux_arm64.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 +}