From 5b23eafd1e2c884a658c2e291a725949b13ec3b6 Mon Sep 17 00:00:00 2001
From: Nico Neumann <33637944+neumann-nico@users.noreply.github.com>
Date: Mon, 12 Feb 2024 16:20:11 +0100
Subject: [PATCH] Fix rootless images

---
 runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile | 6 +++---
 runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile b/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile
index d37e389e..9097fb0a 100644
--- a/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile
+++ b/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile
@@ -153,10 +153,10 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && if [ "$ARCH" = "aarch64" ]; then export ARCH=arm64 ; fi \
     && if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=amd64 ; fi \
-    && mkdir -p /usr/libexec/docker/cli-plugins \
-    && curl -fLo /usr/libexec/docker/cli-plugins/docker-buildx \
+    && mkdir -p /home/runner/.docker/cli-plugins \
+    && curl -fLo /home/runner/.docker/cli-plugins/docker-buildx \
         "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${ARCH}" \
-    && chmod +x /usr/libexec/docker/cli-plugins/docker-buildx
+    && chmod +x /home/runner/.docker/cli-plugins/docker-buildx
 
 # Create folder structure here to avoid permission issues
 # when mounting the daemon.json file from a configmap.
diff --git a/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile b/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile
index 1ff34252..5617103a 100644
--- a/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile
+++ b/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile
@@ -131,10 +131,10 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
 RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
     && if [ "$ARCH" = "aarch64" ]; then export ARCH=arm64 ; fi \
     && if [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "i386" ]; then export ARCH=amd64 ; fi \
-    && mkdir -p /usr/libexec/docker/cli-plugins \
-    && curl -fLo /usr/libexec/docker/cli-plugins/docker-buildx \
+    && mkdir -p /home/runner/.docker/cli-plugins \
+    && curl -fLo /home/runner/.docker/cli-plugins/docker-buildx \
         "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${ARCH}" \
-    && chmod +x /usr/libexec/docker/cli-plugins/docker-buildx
+    && chmod +x /home/runner/.docker/cli-plugins/docker-buildx
 
 # Create folder structure here to avoid permission issues
 # when mounting the daemon.json file from a configmap.