From 4fd5a7717144f315a08f2c9a69e589b5b81ce970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A5le=20Pedersen?= Date: Fri, 20 Feb 2026 14:51:50 +0100 Subject: [PATCH] lets try usin printfs... --- qDup-core/src/test/resources/Dockerfile | 38 +++++++++++-------------- qDup/src/test/resources/Dockerfile | 38 +++++++++++-------------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/qDup-core/src/test/resources/Dockerfile b/qDup-core/src/test/resources/Dockerfile index bf6e75bd..7112505a 100644 --- a/qDup-core/src/test/resources/Dockerfile +++ b/qDup-core/src/test/resources/Dockerfile @@ -11,28 +11,24 @@ echo podman:10000:5000 > /etc/subgid; VOLUME /var/lib/containers VOLUME /home/podman/.local/share/containers -RUN cat > /etc/containers/containers.conf << 'EOF' -[containers] -netns="host" -userns="host" -ipcns="host" -utsns="host" -cgroupns="host" -cgroups="disabled" -log_driver = "k8s-file" -[engine] -cgroup_manager = "cgroupfs" -events_logger="file" -runtime="crun" -EOF +RUN printf '[containers]\n\ +netns="host"\n\ +userns="host"\n\ +ipcns="host"\n\ +utsns="host"\n\ +cgroupns="host"\n\ +cgroups="disabled"\n\ +log_driver = "k8s-file"\n\ +[engine]\n\ +cgroup_manager = "cgroupfs"\n\ +events_logger="file"\n\ +runtime="crun"\n' > /etc/containers/containers.conf RUN mkdir -p /home/podman/.config/containers/ -RUN cat > /home/podman/.config/containers/containers.conf << 'EOF' -[containers] -volumes = [ - "/proc:/proc", -] -default_sysctls = [] -EOF +RUN printf '[containers]\n\ +volumes = [\n\ + "/proc:/proc",\n\ +]\n\ +default_sysctls = []\n' > /home/podman/.config/containers/containers.conf RUN chown podman:podman -R /home/podman diff --git a/qDup/src/test/resources/Dockerfile b/qDup/src/test/resources/Dockerfile index bf6e75bd..7112505a 100644 --- a/qDup/src/test/resources/Dockerfile +++ b/qDup/src/test/resources/Dockerfile @@ -11,28 +11,24 @@ echo podman:10000:5000 > /etc/subgid; VOLUME /var/lib/containers VOLUME /home/podman/.local/share/containers -RUN cat > /etc/containers/containers.conf << 'EOF' -[containers] -netns="host" -userns="host" -ipcns="host" -utsns="host" -cgroupns="host" -cgroups="disabled" -log_driver = "k8s-file" -[engine] -cgroup_manager = "cgroupfs" -events_logger="file" -runtime="crun" -EOF +RUN printf '[containers]\n\ +netns="host"\n\ +userns="host"\n\ +ipcns="host"\n\ +utsns="host"\n\ +cgroupns="host"\n\ +cgroups="disabled"\n\ +log_driver = "k8s-file"\n\ +[engine]\n\ +cgroup_manager = "cgroupfs"\n\ +events_logger="file"\n\ +runtime="crun"\n' > /etc/containers/containers.conf RUN mkdir -p /home/podman/.config/containers/ -RUN cat > /home/podman/.config/containers/containers.conf << 'EOF' -[containers] -volumes = [ - "/proc:/proc", -] -default_sysctls = [] -EOF +RUN printf '[containers]\n\ +volumes = [\n\ + "/proc:/proc",\n\ +]\n\ +default_sysctls = []\n' > /home/podman/.config/containers/containers.conf RUN chown podman:podman -R /home/podman