From 97b84029a9e4700cd88d7465afd9da3c7730fb4f Mon Sep 17 00:00:00 2001 From: Aditya R Date: Mon, 3 Jul 2023 11:52:59 +0530 Subject: [PATCH] contrib/buildahimage: set config correctly for rootless build user For image published at `quay.io/containers/buildah` buildah should correctly use `fuseoverlay` for rootless `build` user `fuse-overlayfs`. Closes: https://github.com/containers/buildah/issues/4669 [NO NEW TESTS NEEDED] Signed-off-by: Aditya R --- contrib/buildahimage/Containerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/buildahimage/Containerfile b/contrib/buildahimage/Containerfile index 26be719057..4176c553fe 100644 --- a/contrib/buildahimage/Containerfile +++ b/contrib/buildahimage/Containerfile @@ -89,7 +89,17 @@ RUN useradd build && \ echo -e "build:1:999\nbuild:1001:64535" > /etc/subuid && \ echo -e "build:1:999\nbuild:1001:64535" > /etc/subgid && \ mkdir -p /home/build/.local/share/containers && \ + mkdir -p /home/build/.config/containers && \ chown -R build:build /home/build +# See: https://github.com/containers/buildah/issues/4669 +# Copy & modify the config for the `build` user and remove the global +# `runroot` and `graphroot` which current `build` user cannot access, +# in such case storage will choose a runroot in `/var/tmp`. +RUN sed -e 's|^#mount_program|mount_program|g' \ + -e 's|^graphroot|#graphroot|g' \ + -e 's|^runroot|#runroot|g' \ + /etc/containers/storage.conf \ + > /home/build/.config/containers/storage.conf VOLUME /var/lib/containers VOLUME /home/build/.local/share/containers