From 347328f348a41e1938f3f92e329be7e9811d3e30 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sun, 11 Sep 2016 00:10:17 +0100 Subject: [PATCH] clean up main Dockerfile and Makefile to use exact correct context, tar input Signed-off-by: Justin Cormack --- alpine/Dockerfile | 44 ++------------------------------------------ alpine/Makefile | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 43 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 45eac5aea..3e8b0c39a 100644 --- a/alpine/Dockerfile +++ b/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 && \ diff --git a/alpine/Makefile b/alpine/Makefile index efc0c5c1d..950136ea0 100644 --- a/alpine/Makefile +++ b/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