Merge branch 'master' into 'master'

Fix #4684 for K3s/containerd Closes #4684 See merge request gitlab-org/gitlab-runner!1605

Merge branch 'master' into 'master'
f92b5a39 · Steve Xuereb - Out of Office Back 2025-04-21 · e7d7670d · ca3f7009 · f92b5a39
Commit f92b5a39 authored 5 years ago by Steve Xuereb - Out of Office Back 2025-04-21
--- a/dockerfiles/build/Dockerfile.x86_64
+++ b/dockerfiles/build/Dockerfile.x86_64
@@ -12,3 +12,5 @@ COPY ./scripts/ /usr/bin
 COPY ./binaries/gitlab-runner-helper.x86_64 /usr/bin/gitlab-runner-helper

 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
+
+CMD ["sh"]
\ No newline at end of file