Update scripts

scripts/bootstrap

@@ -8,7 +8,7 @@ apt-get update
 apt-get install -y curl rsync build-essential syslinux xorriso
 
 
-curl -sL https://test.docker.com/builds/Linux/x86_64/docker-1.5.0-rc4 > /usr/bin/docker
+curl -sL https://github.com/ibuildthecloud/docker/releases/download/v1.5.0-rancher-2/docker-1.5.0 > /usr/bin/docker
 
 chmod +x /usr/bin/docker
 

scripts/build

@@ -10,7 +10,9 @@ if [ -f ./build/bootstrap.envs ];then
     . ./build/bootstrap.envs
 fi
 
+if [ -z "$ROS_CUSTOM_GOPATH" ]; then
     export GOPATH=$(pwd)/Godeps/_workspace:$(pwd)/gopath
+fi
 
 PACKAGE=./gopath/src/$(<.package)
 

scripts/dockerimages/05-console

@@ -1,2 +1,3 @@
 FROM base
-CMD ["/bin/sh"]
+COPY scripts/dockerimages/scripts/console.sh /
+CMD ["/console.sh"]

scripts/dockerimages/scripts/console.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+exec respawn << EOF
+/sbin/getty 115200 tty1
+/sbin/getty 115200 tty2
+/sbin/getty 115200 tty3
+/sbin/getty 115200 tty4
+/sbin/getty 115200 tty5
+/sbin/getty 115200 tty6
+EOF

scripts/dockerimages/scripts/docker.sh

@@ -12,7 +12,7 @@ for i in $CGROUPS; do
 done
 
 if ! lsmod | grep -q br_netfilter; then
-    modprobe br_netfilter
+    modprobe br_netfilter 2>/dev/null || true
 fi
 
 rm -f /var/run/docker.pid

scripts/dockerimages/scripts/os-dockerfile

@@ -1,4 +1,4 @@
 FROM scratch
 COPY init busybox docker images.tar /
 COPY lib /lib
-CMD ["/init"]
+CMD ["/init", "rancher.disable=[udev,network]"]

scripts/download

@@ -5,4 +5,4 @@ cd $(dirname $0)/..
 source scripts/build-common
 
 download a8e5925eab10a472af4b9326dc3ff1068fd56886 https://github.com/rancherio/os-base/releases/download/v0.0.1/os-base.tar.xz
-download c7d977c2bdc48c022fcf3a51a6e26229247cfb15 https://test.docker.com/builds/Linux/x86_64/docker-1.5.0-rc4
+download 1acbe869b32869bca5788373e8624a2957cbb380 https://github.com/ibuildthecloud/docker/releases/download/v1.5.0-rancher-2/docker-1.5.0

scripts/run

@@ -33,7 +33,7 @@ cd ${INITRD_TMP}
 
 if [ "$1" == "--docker" ]; then
     docker build -t rancheros-run .
-    docker run --privileged -it rancheros-run
+    docker run --rm --privileged -it rancheros-run
 else
     find | cpio -H newc -o > ${INITRD_TEST}
 
@@ -41,5 +41,5 @@ else
         zcat ${HD_GZ} > ${HD}
     fi
 
-    kvm -m 1024 -kernel ${KERNEL} -initrd ${INITRD_TEST} -append "$1" -hda ${HD} -serial stdio -netdev user,id=hostnet0 -device virtio-net-pci,romfile=,netdev=hostnet0
+    kvm -m 1024 -kernel ${KERNEL} -initrd ${INITRD_TEST} -append "$@" -hda ${HD} -serial stdio -netdev user,id=hostnet0 -device virtio-net-pci,romfile=,netdev=hostnet0
 fi