mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-22 18:41:37 +00:00
Add || true
to the docker rmi
invocations in the clean target
Linux xargs calls the command with no arguments if it gets no inputs, which `docker rmi` complains about. It provides -r / --no-run-if-empty to prevent this but unfortunately this isn't supported on OSX. Ignore errors from `docker rmi` so that `make clean` will keep going and clean up later stuff. Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
parent
35ee340e46
commit
5165a6c795
4
Makefile
4
Makefile
@ -27,5 +27,5 @@ qemu-arm: Dockerfile.qemu.armhf arm
|
||||
clean:
|
||||
$(MAKE) -C alpine clean
|
||||
$(MAKE) -C xhyve clean
|
||||
docker images -q mobyqemu:build | xargs docker rmi -f
|
||||
docker images -q justincormack/remora | xargs docker rmi -f
|
||||
docker images -q mobyqemu:build | xargs docker rmi -f || true
|
||||
docker images -q justincormack/remora | xargs docker rmi -f || true
|
||||
|
@ -18,5 +18,5 @@ zImage: kernel_config.arm Dockerfile
|
||||
|
||||
clean:
|
||||
rm -f zImage vmlinuz64 aufs-utils.tar kernel-source-info kernel-patches.tar
|
||||
docker images -q mobykernel:build | xargs docker rmi -f
|
||||
docker images -q mobyarmkernel:build | xargs docker rmi -f
|
||||
docker images -q mobykernel:build | xargs docker rmi -f || true
|
||||
docker images -q mobyarmkernel:build | xargs docker rmi -f || true
|
||||
|
@ -18,4 +18,4 @@ hvsock.o: hvsock.c hvsock.h
|
||||
|
||||
clean:
|
||||
rm -f 9pmount-vsock
|
||||
docker images -q 9pmount-vsock:build | xargs docker rmi -f
|
||||
docker images -q 9pmount-vsock:build | xargs docker rmi -f || true
|
||||
|
@ -12,4 +12,4 @@ diagnostics-server: Dockerfile main.go vendor
|
||||
|
||||
clean:
|
||||
rm -rf diagnostics-server vendor
|
||||
docker images -q diagnostics:build | xargs docker rmi -f
|
||||
docker images -q diagnostics:build | xargs docker rmi -f || true
|
||||
|
@ -8,4 +8,4 @@ linuxx64.efi.stub: Dockerfile gummiboot/*
|
||||
|
||||
clean:
|
||||
rm -f linuxx64.efi.stub gummiboot.tar.gz
|
||||
docker images -q gummiboot:build | xargs docker rmi -f
|
||||
docker images -q gummiboot:build | xargs docker rmi -f || true
|
||||
|
@ -10,4 +10,4 @@ hvtools: Dockerfile src/*
|
||||
|
||||
clean:
|
||||
rm -f hv_fcopy_daemon hv_kvp_daemon hv_vss_daemon
|
||||
docker images -q hvtools:build | xargs docker rmi -f
|
||||
docker images -q hvtools:build | xargs docker rmi -f || true
|
||||
|
@ -8,4 +8,4 @@ llmnrd: Dockerfile src/*
|
||||
|
||||
clean:
|
||||
rm -f llmnrd llmnrd.tar.gz
|
||||
docker images -q llmnrd:build | xargs docker rmi -f
|
||||
docker images -q llmnrd:build | xargs docker rmi -f || true
|
||||
|
@ -12,4 +12,4 @@ nc-vsock: $(DEPS)
|
||||
|
||||
clean:
|
||||
rm -f nc-vsock
|
||||
docker images -q nc-vsock:build | xargs docker rmi -f
|
||||
docker images -q nc-vsock:build | xargs docker rmi -f || true
|
||||
|
@ -12,4 +12,4 @@ proxy: Dockerfile main.go proxy.go vendor
|
||||
|
||||
clean:
|
||||
rm -rf proxy vendor
|
||||
docker images -q proxy:build | xargs docker rmi -f
|
||||
docker images -q proxy:build | xargs docker rmi -f || true
|
||||
|
@ -21,4 +21,4 @@ tap-vsockd.o: tap-vsockd.c hvsock.h
|
||||
|
||||
clean:
|
||||
rm -f tap-vsockd
|
||||
docker images -q tap-vsockd:build | xargs docker rmi -f
|
||||
docker images -q tap-vsockd:build | xargs docker rmi -f || true
|
||||
|
@ -15,4 +15,4 @@ transfused: $(DEPS)
|
||||
|
||||
clean:
|
||||
rm -f transfused
|
||||
docker images -q transfused:build | xargs docker rmi -f
|
||||
docker images -q transfused:build | xargs docker rmi -f || true
|
||||
|
@ -12,4 +12,4 @@ vsudd: Dockerfile main.go vendor
|
||||
|
||||
clean:
|
||||
rm -rf vsudd vendor
|
||||
docker images -q vsudd:build | xargs docker rmi -f
|
||||
docker images -q vsudd:build | xargs docker rmi -f || true
|
||||
|
Loading…
Reference in New Issue
Block a user