From d61b27b8395512808df5349f5620ec37a3a4afde Mon Sep 17 00:00:00 2001
From: Tingluo Huang <tingluohuang@github.com>
Date: Thu, 2 Mar 2023 13:42:23 -0500
Subject: [PATCH] Change runner image to make user/folder align with
 ubuntu-latest hosted runner. (#2469)

---
 images/Dockerfile | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/images/Dockerfile b/images/Dockerfile
index 8fe339320..315196e49 100644
--- a/images/Dockerfile
+++ b/images/Dockerfile
@@ -24,11 +24,26 @@ RUN export DOCKER_ARCH=x86_64 \
 
 FROM mcr.microsoft.com/dotnet/runtime-deps:6.0
 
-ENV RUNNER_ALLOW_RUNASROOT=1
+ENV DEBIAN_FRONTEND=noninteractive
 ENV RUNNER_MANUALLY_TRAP_SIG=1
 ENV ACTIONS_RUNNER_PRINT_LOG_TO_STDOUT=1
 
-WORKDIR /actions-runner
-COPY --from=build /actions-runner .
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN install -o root -g root -m 755 docker/* /usr/bin/ && rm -rf docker
\ No newline at end of file
+RUN adduser --disabled-password --gecos "" --uid 1001 runner \
+    && groupadd docker --gid 123 \
+    && usermod -aG sudo runner \
+    && usermod -aG docker runner \
+    && echo "%sudo   ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers \
+    && echo "Defaults env_keep += \"DEBIAN_FRONTEND\"" >> /etc/sudoers
+
+WORKDIR /home/runner
+
+COPY --chown=runner:docker --from=build /actions-runner .
+
+RUN install -o root -g root -m 755 docker/* /usr/bin/ && rm -rf docker
+
+USER runner
\ No newline at end of file