Skip to content

Commit 8ccec5d

Browse files
committed
Makefile: Add implicit SELinux labels when using podman
Podman is a Docker replacement, which is developed by RedHat and available on related Linux distributions (e.g. RHEL or Fedora). Podman differs from Docker in several security-related aspects. One of them is, that Podman requires poper SELinux labels on volume content mounted into a container. This difference to Docker results in the following error when building a document (the riscv-isa-manual in this example): Emulate Docker CLI using podman. Create /etc/containers/nodocker to quiet msg. /var/lib/gems/3.0.0/gems/asciidoctor-2.0.23/lib/asciidoctor/cli/options.rb:238:in `stat': Permission denied @ rb_file_s_stat - src/riscv-privileged.adoc (Errno::EACCES) from /var/lib/gems/3.0.0/gems/asciidoctor-2.0.23/lib/asciidoctor/cli/options.rb:238:in `block in parse!' from /var/lib/gems/3.0.0/gems/asciidoctor-2.0.23/lib/asciidoctor/cli/options.rb:236:in `each' from /var/lib/gems/3.0.0/gems/asciidoctor-2.0.23/lib/asciidoctor/cli/options.rb:236:in `parse!' from /var/lib/gems/3.0.0/gems/asciidoctor-pdf-2.3.18/bin/asciidoctor-pdf:40:in `<top (required)>' from /usr/local/bin/asciidoctor-pdf:25:in `load' from /usr/local/bin/asciidoctor-pdf:25:in `<main>' make[2]: *** [Makefile:92: build/riscv-privileged.pdf] Error 1 To address this, podman-run(1) recommends using the ':z' suffix to the volume mount. This patch does so, if the docker command has been identified (reliably) to be emulated by Podman. Tested on Fedora 40. This change was also accepted and merged as part of the riscv-isa-manual repo, but the patch might be better suited to be included in this project. See also riscv/riscv-isa-manual#1598. Signed-off-by: Christoph Müllner <[email protected]>
1 parent c13766b commit 8ccec5d

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

Makefile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,18 @@ VERSION ?= v0.0.0
2020
REVMARK ?= Draft
2121
DOCKER_IMG := riscvintl/riscv-docs-base-container-image:latest
2222
ifneq ($(SKIP_DOCKER),true)
23-
DOCKER_CMD := docker run --rm -v ${PWD}:/build -w /build \
24-
${DOCKER_IMG} \
25-
/bin/sh -c
23+
DOCKER_IS_PODMAN = \
24+
$(shell ! docker -v 2>&1 | grep podman >/dev/null ; echo $$?)
25+
ifeq "$(DOCKER_IS_PODMAN)" "1"
26+
DOCKER_VOL_SUFFIX = :z
27+
endif
28+
29+
DOCKER_CMD := \
30+
docker run --rm \
31+
-v ${PWD}:/build${DOCKER_VOL_SUFFIX} \
32+
-w /build \
33+
${DOCKER_IMG} \
34+
/bin/sh -c
2635
DOCKER_QUOTE := "
2736
endif
2837

0 commit comments

Comments
 (0)