vendor dfs-1.10.0 go code

vendor/github.com/rancher/docker-from-scratch/.drone.yml

@@ -1,3 +1,6 @@
-image: rancher/dind:v0.5.0
-script:
- - ./scripts/ci
+build:
+  image: rancher/dapper:1.9.1
+  volumes:
+  - /var/run/docker.sock:/var/run/docker.sock
+  commands:
+  - dapper ./scripts/ci

vendor/github.com/rancher/docker-from-scratch/Dockerfile.dapper

@@ -0,0 +1,37 @@
+FROM golang:1.5.3
+
+RUN curl -o /usr/local/bin/docker -L https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 && \
+    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 GO15VENDOREXPERIMENT 1
+
+RUN mkdir -p ${DAPPER_SOURCE} && ln -s ${DAPPER_SOURCE} /source
+
+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 curl -o ./docker_amd64 -L https://get.docker.com/builds/Linux/x86_64/docker-1.10.0 && \
+    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 && \
+    chmod +x ./docker_arm
+
+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 && \
+    apt-get update && \
+    apt-get install -y crossbuild-essential-armhf
+
+CMD ./scripts/ci

vendor/github.com/rancher/docker-from-scratch/Dockerfile.wrap

@@ -1,3 +0,0 @@
-FROM rancher/dind:v0.5.0
-WORKDIR /source
-

vendor/github.com/rancher/docker-from-scratch/build.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-rm -rf $(dirname $0)/build
+cd $(dirname $0)
+rm -rf ./build
 
 export NO_TEST=true
-exec $(dirname $0)/scripts/ci
+dapper ./scripts/ci

vendor/github.com/rancher/docker-from-scratch/scratch.go

@@ -520,8 +520,8 @@ func setupLogging(config *Config) error {
 		return err
 	}
 
-	syscall.Dup2(int(output.Fd()), int(os.Stdout.Fd()))
-	syscall.Dup2(int(output.Fd()), int(os.Stderr.Fd()))
+	syscall.Dup3(int(output.Fd()), int(os.Stdout.Fd()), 0)
+	syscall.Dup3(int(output.Fd()), int(os.Stderr.Fd()), 0)
 
 	return nil
 }