github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-24 19:28:09 +00:00
Code Issues Projects Releases Wiki Activity

move mkinitrd to /

Browse Source 
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
This commit is contained in:
Justin Cormack 2016-09-10 21:50:50 +01:00 committed by Justin Cormack
parent 1b487549bb
commit b605c70ce5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alpine/Dockerfile
View File

@ -11,7 +11,6 @@ COPY etc /etc/
RUN mkdir -p /etc/docker RUN mkdir -p /etc/docker
ADD kernel/$ARCH/aufs-utils.tar / ADD kernel/$ARCH/aufs-utils.tar /
COPY mkinitrd.sh /bin/
COPY kernel/$ARCH/kernel-source-info /etc/ COPY kernel/$ARCH/kernel-source-info /etc/
ADD kernel/$ARCH/kernel-patches.tar /etc/kernel-patches ADD kernel/$ARCH/kernel-patches.tar /etc/kernel-patches
ADD kernel/$ARCH/kernel-modules.tar / ADD kernel/$ARCH/kernel-modules.tar /
@ -90,6 +89,7 @@ RUN \
true true
COPY init / COPY init /
COPY mkinitrd.sh /
RUN adduser -D -H -s /sbin/nologin dockremap RUN adduser -D -H -s /sbin/nologin dockremap

2
alpine/Makefile
View File

@ -8,7 +8,7 @@ initrd.img: Dockerfile mkinitrd.sh init $(ETCFILES)
$(MAKE) -j -C packages $(MAKE) -j -C packages
$(MAKE) -C kernel $(MAKE) -C kernel
docker build -t moby-initrd:build . 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 initrd.img.gz: initrd.img
cat initrd.img | gzip -9 > initrd.img.gz cat initrd.img | gzip -9 > initrd.img.gz

2
alpine/mkinitrd.sh
View File

@ -32,7 +32,7 @@ EOF
printf 'moby' > /tmp/etc/hostname printf 'moby' > /tmp/etc/hostname
rm /tmp/bin/mkinitrd.sh rm /tmp/mkinitrd.sh
cd /tmp cd /tmp
find . | cpio -H newc -o find . | cpio -H newc -o