From 1558fa85244b24d295938479cd79f0fa5580e647 Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Tue, 12 Mar 2024 14:35:55 +0100
Subject: [PATCH] extend logging during build

---
 build-image.sh   | 2 ++
 image/Dockerfile | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build-image.sh b/build-image.sh
index ad17401..f35872d 100644
--- a/build-image.sh
+++ b/build-image.sh
@@ -55,6 +55,8 @@ fi
 
 # https://github.com/docker/buildx/#building-multi-platform-images
 set -x
+
+docker --version
 docker run --privileged --rm tonistiigi/binfmt --install all
 export DOCKER_CLI_EXPERIMENTAL=enabled # prevents "docker: 'buildx' is not a docker command."
 docker buildx create --use # prevents: error: multiple platforms feature is currently not supported for docker driver. Please switch to a different driver (eg. "docker buildx create --use")
diff --git a/image/Dockerfile b/image/Dockerfile
index 0cba6b0..c72b95d 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -108,7 +108,7 @@ RUN --mount=type=bind,source=.shared,target=/mnt/shared <<EOF
       "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
       "$(source /etc/os-release && echo "$VERSION_CODENAME")" stable" > /etc/apt/sources.list.d/docker.list
     apt-get update
-    apt-get install --no-install-recommends -y docker-ce containerd.io fuse-overlayfs
+    (set -x; apt-get install --no-install-recommends -y docker-ce containerd.io fuse-overlayfs)
     apt-get remove -y gnupg
 
     minimize /usr/bin/containerd* /usr/bin/ctr /usr/bin/docker* /usr/bin/runc
@@ -131,15 +131,16 @@ RUN --mount=type=bind,source=.shared,target=/mnt/shared <<EOF
 
     if [[ $FLAVOR == dind-rootless ]]; then
       # https://docs.docker.com/engine/security/rootless/
-      apt-get install --no-install-recommends -y \
+      (set -x; apt-get install --no-install-recommends -y \
         dbus-user-session \
         docker-ce-rootless-extras \
         kmod \
         iproute2 \
         slirp4netns \
-        uidmap
+        uidmap)
 
-      runuser -u act -g act -- /usr/bin/dockerd-rootless-setuptool.sh install --skip-iptables
+      (set -x; rootlesskit --version)
+      (set -x; runuser -u act -g act -- /usr/bin/dockerd-rootless-setuptool.sh install --skip-iptables)
 
       # workaround "failed to load plugin io.containerd.internal.v1.opt  error="mkdir /opt/containerd: permission denied"
       mkdir /opt/containerd