mirror of
https://github.com/containers/skopeo.git
synced 2025-08-01 23:07:51 +00:00
Partially fix removal of temporary data in (make test-system)
Use (podman unshare) as already suggested, it is necessary for an unprivileged user to remove the temporary c/storage state. OTOH it doesn't work with Docker at all. Don't use the - prefix, it only works at the _start_ of a rule, not in the middle of a multi-line shell script. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
parent
36c480f643
commit
9f04dfdec9
3
Makefile
3
Makefile
@ -205,7 +205,6 @@ test-integration-local: bin/skopeo
|
||||
hack/make.sh test-integration
|
||||
|
||||
# complicated set of options needed to run podman-in-podman
|
||||
# TODO: The $(RM) command will likely fail w/o `podman unshare`
|
||||
test-system:
|
||||
DTEMP=$(shell mktemp -d --tmpdir=/var/tmp podman-tmp.XXXXXX); \
|
||||
$(CONTAINER_CMD) --privileged \
|
||||
@ -214,7 +213,7 @@ test-system:
|
||||
"$(SKOPEO_CIDEV_CONTAINER_FQIN)" \
|
||||
$(MAKE) test-system-local; \
|
||||
rc=$$?; \
|
||||
-$(RM) -rf $$DTEMP; \
|
||||
$(CONTAINER_RUNTIME) unshare rm -rf $$DTEMP; # This probably doesn't work with Docker, oh well, better than nothing... \
|
||||
exit $$rc
|
||||
|
||||
# Intended for CI, assumed to already be running in quay.io/libpod/skopeo_cidev container.
|
||||
|
Loading…
Reference in New Issue
Block a user