From ea74fabcd38520e71d42c30b9151a2fbb9797f97 Mon Sep 17 00:00:00 2001 From: pkegg Date: Thu, 26 Aug 2021 13:58:20 -0400 Subject: [PATCH] Add /etc/mtab to deal with https://github.com/containers/podman/issues/10263 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e02e536cb..635974b13 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ docker-%: PWD := $(shell pwd) docker-%: DOCKER_CMD:= $(shell if which docker 2>/dev/null 1>/dev/null; then echo "docker"; elif which podman 2>/dev/null 1>/dev/null; then echo "podman"; fi) # Podman requires some extra args (`--userns=keep-id` and `--security-opt=label=disable`). Set those args if using podman -docker-%: PODMAN_ARGS:= $(shell if ! which docker 2>/dev/null 1>/dev/null && which podman 2> /dev/null 1> /dev/null; then echo "--userns=keep-id --security-opt=label=disable"; fi) +docker-%: PODMAN_ARGS:= $(shell if ! which docker 2>/dev/null 1>/dev/null && which podman 2> /dev/null 1> /dev/null; then echo "--userns=keep-id --security-opt=label=disable -v /proc/mounts:/etc/mtab"; fi) # Use 'sudo' if docker ps doesn't work. In theory, other things than missing sudo could cause this. But sudo needed is a common issue and easy to fix. docker-%: SUDO := $(shell if which docker 2> /dev/null 1> /dev/null && ! docker ps -q 2> /dev/null 1> /dev/null ; then echo "sudo"; fi)