From 4e081a66bf8b0d935c3d0cb721b3b7e3d81b57a2 Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Mon, 2 Mar 2026 17:50:03 +0100
Subject: [PATCH 1/4] ci-unified: install sudo for backward compatibility

---
 ci-unified/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-unified/Dockerfile b/ci-unified/Dockerfile
index a8aed52..14b5f8a 100644
--- a/ci-unified/Dockerfile
+++ b/ci-unified/Dockerfile
@@ -39,7 +39,7 @@ RUN sed -i "s/REPLACEME/${LLVM_VERSION}/g" /root/.cargo/config && \
 RUN set -eux; \
     apt-get -y update; \
     apt-get install -y --no-install-recommends \
-    libssl-dev make cmake graphviz \
+    libssl-dev make cmake graphviz sudo \
     git pkg-config curl wget time rhash ca-certificates jq \
     python3 python3-pip lsof ruby ruby-bundler git-restore-mtime \
     bzip2 xz-utils zstd unzip gnupg protobuf-compiler

From cab0703b10491a9310e1247fbdf0e6b0257aa5b0 Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Tue, 3 Mar 2026 09:39:48 +0100
Subject: [PATCH 2/4] test ci without sudo

---
 ci-unified/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-unified/Dockerfile b/ci-unified/Dockerfile
index 14b5f8a..a8aed52 100644
--- a/ci-unified/Dockerfile
+++ b/ci-unified/Dockerfile
@@ -39,7 +39,7 @@ RUN sed -i "s/REPLACEME/${LLVM_VERSION}/g" /root/.cargo/config && \
 RUN set -eux; \
     apt-get -y update; \
     apt-get install -y --no-install-recommends \
-    libssl-dev make cmake graphviz sudo \
+    libssl-dev make cmake graphviz \
     git pkg-config curl wget time rhash ca-certificates jq \
     python3 python3-pip lsof ruby ruby-bundler git-restore-mtime \
     bzip2 xz-utils zstd unzip gnupg protobuf-compiler

From 442764e787cc54d094e937414ff2768525f334cf Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Tue, 3 Mar 2026 09:48:49 +0100
Subject: [PATCH 3/4] run ci

---
 ci-unified/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci-unified/Dockerfile b/ci-unified/Dockerfile
index a8aed52..4581afd 100644
--- a/ci-unified/Dockerfile
+++ b/ci-unified/Dockerfile
@@ -20,7 +20,6 @@ ENV SHELL=/bin/bash \
     CXX=clang-${LLVM_VERSION} \
     RUST_BACKTRACE=1
 
-
 ### base ###
 
 # base | add non-root user

From a579d2b853dc8b947f2d86f93751ef9c1f18044e Mon Sep 17 00:00:00 2001
From: alvicsam <alvicsam@gmail.com>
Date: Tue, 3 Mar 2026 15:44:38 +0100
Subject: [PATCH 4/4] add fake sudo

---
 ci-unified/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ci-unified/Dockerfile b/ci-unified/Dockerfile
index 4581afd..3fad678 100644
--- a/ci-unified/Dockerfile
+++ b/ci-unified/Dockerfile
@@ -34,6 +34,10 @@ COPY ci-unified/cargo-config /home/nonroot/.cargo/config
 RUN sed -i "s/REPLACEME/${LLVM_VERSION}/g" /root/.cargo/config && \
     sed -i "s/REPLACEME/${LLVM_VERSION}/g" /home/nonroot/.cargo/config
 
+# base | add fake sudo, actual sudo causes issues
+RUN echo '#!/bin/bash\nexec "$@"' > /usr/local/bin/sudo && \
+    chmod +x /usr/local/bin/sudo
+
 # base | install tools and dependencies
 RUN set -eux; \
     apt-get -y update; \