Build script changes

scripts/dockerimages/00-base

@@ -1,3 +1,23 @@
 FROM scratch
-ADD build/dist/rootfs.tar /
+ADD assets/rootfs.tar /
+# Cleanup Buildroot
+RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \
+    sed -i '/^root/s!/bin/sh!/bin/bash!' /etc/passwd && \
+    echo -e 'RancherOS\n' > /etc/issue && \
+    rm /run \
+       /linuxrc \
+       /etc/os-release \
+       /var/cache \
+       /var/lock \
+       /var/log \
+       /var/run \
+       /var/spool \
+       /var/lib/misc && \
+    mkdir -p \
+       /run \
+       /var/cache \
+       /var/lock \
+       /var/log \
+       /var/run \
+       /var/spool
 CMD ["/bin/sh"]

scripts/dockerimages/01-state

@@ -1,6 +1,2 @@
 FROM base
-VOLUME /home
-VOLUME /opt
-VOLUME /var/lib/docker
-VOLUME /var/run
 CMD ["echo"]

scripts/dockerimages/04-userdocker

@@ -1,4 +1,4 @@
 FROM base
 COPY scripts/dockerimages/scripts/docker.sh /
-COPY build/initrd/ca.crt /etc/ssl/certs/ca-certificates.crt
+COPY assets/ca.crt /etc/ssl/certs/ca-certificates.crt
 CMD ["/docker.sh"]

scripts/dockerimages/05-console

@@ -1,6 +1,3 @@
 FROM base
-RUN rm /sbin/poweroff /sbin/reboot /sbin/halt
-RUN sed -i '/^root/s!/bin/sh!/bin/bash!' /etc/passwd
-RUN echo -e 'RancherOS\n' > /etc/issue
-COPY scripts/dockerimages/scripts/console.sh /
-CMD ["/console.sh"]
+COPY scripts/dockerimages/scripts/console.sh /usr/sbin/
+CMD ["/usr/sbin/console.sh"]