diff --git a/alpine/Dockerfile b/alpine/Dockerfile index acd0eabed..b8824726f 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -8,6 +8,8 @@ RUN apk update && apk upgrade && apk add e2fsprogs docker chrony COPY etc /etc/ +COPY mkinitrd.sh /bin/ + RUN \ setup-timezone -z UTC && \ rc-update add swap boot && \ diff --git a/alpine/Makefile b/alpine/Makefile index 4ab2001a8..da0bcabe0 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -7,7 +7,7 @@ ETCFILES+=etc/init.d/chronyd initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) rm -f initrd.img docker build -t moby:test . - docker run -i -v $(PWD):/export moby:test /export/mkinitrd.sh + docker run -i moby:test /bin/mkinitrd.sh > $@ clean: rm -f initrd.img diff --git a/alpine/mkinitrd.sh b/alpine/mkinitrd.sh index 29a130c0c..bd3324b99 100755 --- a/alpine/mkinitrd.sh +++ b/alpine/mkinitrd.sh @@ -48,5 +48,7 @@ mv hosts- hosts mv resolv.conf- resolv.conf mv hostname- hostname +rm /tmp/bin/mkinitrd.sh + cd /tmp -find . | cpio -H newc -o > /export/initrd.img +find . | cpio -H newc -o