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

Merge pull request #912 from justincormack/exclude-cleanup

Browse Source 
Set an exclude pattern when untarring images
This commit is contained in:
Justin Cormack 2016-12-19 18:46:05 +00:00 committed by GitHub
commit ba2ac2396a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
alpine/containers/binfmt/Makefile
View File

@ -7,6 +7,10 @@ default: rootfs
$(QEMU_BINARIES):
docker run --rm --net=none $(QEMU_IMAGE) tar cf - -C /usr/bin $@ | tar xf -
EXCLUDE=--exclude .dockerenv --exclude Dockerfile \
--exclude dev/console --exclude dev/pts --exclude dev/shm \
--exclude etc/hostname --exclude etc/hosts --exclude etc/mtab --exclude etc/resolv.conf
rootfs: Dockerfile main.go 00_moby.conf $(QEMU_BINARIES)
mkdir -p $@
BUILD=$$( tar cf - $^ | docker build -q - ) && \
@ -16,9 +20,8 @@ rootfs: Dockerfile main.go 00_moby.conf $(QEMU_BINARIES)
[ -n "$$IMAGE" ] && \
echo "Built $$IMAGE" && \
CONTAINER=$$( docker create $$IMAGE /dev/null ) && \
docker export $$CONTAINER | tar -xf - -C $@ && \
docker rm $$CONTAINER && \
( cd $@ && rm -rf .dockerenv Dockerfile dev/* etc/hostname etc/hosts etc/mtab etc/resolv.conf )
docker export $$CONTAINER | tar -xf - -C $@ $(EXCLUDE) && \
docker rm $$CONTAINER
clean:
rm -rf rootfs $(QEMU_BINARIES)

9
alpine/containers/rng-tools/Makefile
View File

@ -7,6 +7,10 @@ default: rootfs
$(TINI_BINARY): Dockerfile
docker run --rm --net=none $(TINI_IMAGE) tar cf - -C /bin $@ | tar xf -
EXCLUDE=--exclude .dockerenv --exclude Dockerfile \
--exclude dev/console --exclude dev/pts --exclude dev/shm \
--exclude etc/hostname --exclude etc/hosts --exclude etc/mtab --exclude etc/resolv.conf
rootfs: Dockerfile fix-textrels-on-PIC-x86.patch sha256sums $(TINI_BINARY)
mkdir -p $@
BUILD=$$( tar cf - $^ | docker build -q - ) && \
@ -16,9 +20,8 @@ rootfs: Dockerfile fix-textrels-on-PIC-x86.patch sha256sums $(TINI_BINARY)
[ -n "$$IMAGE" ] && \
echo "Built $$IMAGE" && \
CONTAINER=$$( docker create $$IMAGE /dev/null ) && \
docker export $$CONTAINER | tar -xf - -C $@ && \
docker rm $$CONTAINER && \
( cd $@ && rm -rf .dockerenv Dockerfile dev/* etc/hostname etc/hosts etc/mtab etc/resolv.conf )
docker export $$CONTAINER | tar -xf - -C $@ $(EXCLUDE) && \
docker rm $$CONTAINER
clean:
rm -rf rootfs $(TINI_BINARY)