From 38859d58d097c8653667c775860dc3ee8f0a5980 Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Wed, 13 Mar 2024 12:11:49 +0100
Subject: [PATCH] restore rootless image builds

---
 .github/workflows/build.yml | 14 ++++++--------
 image/Dockerfile            |  6 +++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c942e42..e4ee0d4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,20 +52,18 @@ jobs:
           - DOCKER_IMAGE_FLAVOR: dind
             DOCKER_IMAGE_TAG_PREFIX: dind-
             GITEA_ACT_RUNNER_VERSION: latest
-          # https://github.com/rootless-containers/rootlesskit/issues/425
-          #- DOCKER_IMAGE_FLAVOR: dind-rootless
-          #  DOCKER_IMAGE_TAG_PREFIX: dind-rootless-
-          #  GITEA_ACT_RUNNER_VERSION: latest
+          - DOCKER_IMAGE_FLAVOR: dind-rootless
+            DOCKER_IMAGE_TAG_PREFIX: dind-rootless-
+            GITEA_ACT_RUNNER_VERSION: latest
           - DOCKER_IMAGE_FLAVOR: dood
             DOCKER_IMAGE_TAG_PREFIX: ""
             GITEA_ACT_RUNNER_VERSION: nightly
           - DOCKER_IMAGE_FLAVOR: dind
             DOCKER_IMAGE_TAG_PREFIX: dind-
             GITEA_ACT_RUNNER_VERSION: nightly
-          # https://github.com/rootless-containers/rootlesskit/issues/425
-          #- DOCKER_IMAGE_FLAVOR: dind-rootless
-          #  DOCKER_IMAGE_TAG_PREFIX: dind-rootless-
-          #  GITEA_ACT_RUNNER_VERSION: nightly
+          - DOCKER_IMAGE_FLAVOR: dind-rootless
+            DOCKER_IMAGE_TAG_PREFIX: dind-rootless-
+            GITEA_ACT_RUNNER_VERSION: nightly
       fail-fast: true
 
     steps:
diff --git a/image/Dockerfile b/image/Dockerfile
index 118196e..ae4a5ab 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -135,12 +135,16 @@ RUN --mount=type=bind,source=.shared,target=/mnt/shared <<EOF
       # https://docs.docker.com/engine/security/rootless/
       (set -x; apt-get install --no-install-recommends -y \
         dbus-user-session \
-        docker-ce-rootless-extras \
+        `# docker-ce-rootless-extras` \
         kmod \
         iproute2 \
         slirp4netns \
         uidmap)
 
+      # workaround for "[rootlesskit:parent] error: failed to start the child: fork/exec /proc/self/exe: operation not permitted"
+      # see https://github.com/rootless-containers/rootlesskit/issues/425
+      (set -x; apt-get install --no-install-recommends -y docker-ce-rootless-extras=5:25.0.3-1~debian.12~bookworm --allow-downgrades)
+
       (set -x; rootlesskit --version)
       (set -x; runuser -u act -g act -- /usr/bin/dockerd-rootless-setuptool.sh install --skip-iptables)