update buildroot and docker, add resolv.conf

Author: nlf

Dockerfile

@@ -13,20 +13,20 @@ RUN apt-get update && apt-get install -y unzip \
 ENV ROOTFS /overlay
 
 RUN mkdir -p /build
-ENV BUILDROOT_VERSION 20150916
+ENV BUILDROOT_VERSION 20151106
 RUN curl -L -o /build/buildroot.tar.bz2 http://buildroot.uclibc.org/downloads/snapshots/buildroot-$BUILDROOT_VERSION.tar.bz2 && \
     cd /build && \
     tar xf buildroot.tar.bz2 && \
     rm /build/buildroot.tar.bz2
 
 # Add docker to our overlay
-RUN mkdir -p $ROOTFS/usr/local/bin
-ENV DOCKER_VERSION 1.8.2
-RUN curl -L -o $ROOTFS/usr/local/bin/docker https://get.docker.io/builds/Linux/x86_64/docker-$DOCKER_VERSION && \
-    chmod +x $ROOTFS/usr/local/bin/docker
+RUN mkdir -p $ROOTFS/usr/bin
+ENV DOCKER_VERSION 1.9.0
+RUN curl -L -o $ROOTFS/usr/bin/docker https://get.docker.io/builds/Linux/x86_64/docker-$DOCKER_VERSION && \
+    chmod +x $ROOTFS/usr/bin/docker
 
 # Copy our custom overlay
-ENV VERSION 1.3.0
+ENV VERSION 1.4.0
 COPY rootfs $ROOTFS
 RUN echo $VERSION > $ROOTFS/etc/version
 

rootfs/etc/init.d/S51docker

@@ -22,7 +22,7 @@ start() {
     done
 
     start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/docker.pid \
-        --startas /bin/sh -- -c "exec  /usr/local/bin/docker $DOCKER_ARGS >/var/log/docker.log 2>&1"
+        --startas /bin/sh -- -c "exec  /usr/bin/docker $DOCKER_ARGS >/var/log/docker.log 2>&1"
     [ $? = 0 ] && echo "OK" || echo "FAIL"
 }
 stop() {

rootfs/etc/resolv.conf

@@ -0,0 +1 @@
+nameserver 8.8.8.8