From bc7e4fecbd0245dd0fbefb43dbc3017297f0dccc Mon Sep 17 00:00:00 2001 From: Vitaliy Potyarkin Date: Thu, 26 Dec 2024 17:44:44 +0300 Subject: [PATCH] [#6] oci-runner: Use non-standard socket path to avoid collisions Signed-off-by: Vitaliy Potyarkin --- oci-runner/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/oci-runner/Dockerfile b/oci-runner/Dockerfile index 4f93700..153a0dd 100644 --- a/oci-runner/Dockerfile +++ b/oci-runner/Dockerfile @@ -10,10 +10,15 @@ RUN apt-get update && \ ln -s /usr/bin/podman /usr/local/bin/docker && \ echo root:10000:1000 > /etc/subuid && \ echo root:10000:1000 > /etc/subgid && \ - echo '#!/bin/bash\npodman system service -t 0 unix:///var/run/docker.sock &\ndisown' > /usr/local/bin/podman-service.sh && \ + echo '#!/bin/bash\npodman system service -t 0 unix:///tmp/podman-service.socket &\ndisown' > /usr/local/bin/podman-service.sh && \ chmod +x /usr/local/bin/podman-service.sh # Configuration for podman inside rootless podman COPY containers.conf /etc/containers/containers.conf COPY registries.conf /etc/containers/registries.conf COPY storage.conf /etc/containers/storage.conf + +# Configuration for testcontainers +ENV DOCKER_HOST=unix:///tmp/podman-service.socket +ENV TESTCONTAINERS_DOCKER_SOCKER_OVERRIDE=/tmp/podman-service.socket +ENV TESTCONTAINERS_RYUK_DISABLED=true