clean up main Dockerfile and Makefile to use exact correct context, tar input

Signed-off-by: Justin Cormack <justin@specialbusservice.com>

alpine/Dockerfile

@@ -8,48 +8,8 @@ RUN \
   passwd -d root && \
   adduser -D -H -s /sbin/nologin dockremap
 
-COPY etc /etc/
-
-COPY kernel/usr /usr/
-COPY kernel/etc /etc/
-COPY kernel/sbin /sbin/
-COPY kernel/lib /lib/
-
-COPY init /
-COPY mkinitrd.sh /
-
-COPY packages/proxy/usr /usr/
-COPY packages/proxy/sbin /sbin/
-COPY packages/proxy/etc /etc/
-COPY packages/transfused/sbin /sbin/
-COPY packages/transfused/etc /etc/
-COPY packages/tap-vsockd/sbin /sbin/
-COPY packages/tap-vsockd/etc /etc/
-COPY packages/docker/usr /usr/
-COPY packages/docker/etc /etc/
-COPY packages/diagnostics/usr /usr/
-COPY packages/diagnostics/etc /etc/
-COPY packages/automount/etc /etc/
-COPY packages/binfmt_misc/etc /etc/
-COPY packages/hostsettings/etc /etc/
-COPY packages/hvtools/sbin /sbin/
-COPY packages/hvtools/etc /etc/
-COPY packages/hvtools/usr /usr/
-COPY packages/chronyd/etc /etc/
-COPY packages/userns/etc /etc/
-COPY packages/nc-vsock/usr /usr/
-COPY packages/vsudd/sbin /sbin/
-COPY packages/vsudd/etc /etc/
-COPY packages/mobyconfig/usr /usr/
-COPY packages/mobyplatform/usr /usr/
-COPY packages/oom/etc /etc/
-COPY packages/9pmount-vsock/sbin /sbin/
-COPY packages/test/etc /etc/
-COPY packages/test/usr /usr/
-COPY packages/iptables/usr /usr/
-COPY packages/containerd/etc /etc/
-COPY packages/aws/etc /etc/
-COPY packages/azure/etc /etc/
+COPY . .
+RUN rm Dockerfile
 
 RUN \
   rc-update add swap boot && \

alpine/Makefile

@@ -7,7 +7,33 @@ initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES)
 	rm -f initrd.img
 	$(MAKE) -j -C packages
 	$(MAKE) -C kernel
-	docker build -t moby-initrd:build .
+	tar cf - \
+	  Dockerfile etc init mkinitrd.sh \
+	  -C kernel usr etc sbin lib -C .. \
+	  -C packages/proxy usr sbin etc -C ../.. \
+	  -C packages/transfused sbin etc -C ../.. \
+	  -C packages/tap-vsockd sbin etc -C ../.. \
+	  -C packages/docker usr etc -C ../.. \
+	  -C packages/diagnostics usr etc -C ../.. \
+	  -C packages/automount etc -C ../.. \
+	  -C packages/binfmt_misc etc -C ../.. \
+	  -C packages/hostsettings etc -C ../.. \
+	  -C packages/hvtools sbin etc usr -C ../.. \
+	  -C packages/chronyd etc -C ../.. \
+	  -C packages/userns etc -C ../.. \
+	  -C packages/nc-vsock usr -C ../.. \
+	  -C packages/vsudd sbin etc -C ../.. \
+	  -C packages/mobyconfig usr -C ../.. \
+	  -C packages/mobyplatform usr -C ../.. \
+	  -C packages/oom etc -C ../.. \
+	  -C packages/9pmount-vsock sbin -C ../.. \
+	  -C packages/test etc usr -C ../.. \
+	  -C packages/iptables usr -C ../.. \
+	  -C packages/containerd etc -C ../.. \
+	  -C packages/aws etc -C ../.. \
+	  -C packages/azure etc -C ../.. \
+	  | \
+	  docker build -t moby-initrd:build -
 	docker run --net=none --rm moby-initrd:build /mkinitrd.sh > $@
 
 initrd.img.gz: initrd.img