diff --git a/alpine/Dockerfile b/alpine/Dockerfile index cc8026c4c..80ac654e8 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -11,7 +11,6 @@ COPY etc /etc/ RUN mkdir -p /etc/docker ADD kernel/$ARCH/aufs-utils.tar / -COPY mkinitrd.sh /bin/ COPY kernel/$ARCH/kernel-source-info /etc/ ADD kernel/$ARCH/kernel-patches.tar /etc/kernel-patches ADD kernel/$ARCH/kernel-modules.tar / @@ -90,6 +89,7 @@ RUN \ true COPY init / +COPY mkinitrd.sh / RUN adduser -D -H -s /sbin/nologin dockremap diff --git a/alpine/Makefile b/alpine/Makefile index daa853b9b..efc0c5c1d 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -8,7 +8,7 @@ initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES) $(MAKE) -j -C packages $(MAKE) -C kernel docker build -t moby-initrd:build . - docker run --net=none --rm moby-initrd:build /bin/mkinitrd.sh > $@ + docker run --net=none --rm moby-initrd:build /mkinitrd.sh > $@ initrd.img.gz: initrd.img cat initrd.img | gzip -9 > initrd.img.gz diff --git a/alpine/mkinitrd.sh b/alpine/mkinitrd.sh index bb23c3b0d..894b080de 100755 --- a/alpine/mkinitrd.sh +++ b/alpine/mkinitrd.sh @@ -32,7 +32,7 @@ EOF printf 'moby' > /tmp/etc/hostname -rm /tmp/bin/mkinitrd.sh +rm /tmp/mkinitrd.sh cd /tmp find . | cpio -H newc -o