From 48326f02e2c9a6c6cbd69049454d81d9315975de Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 13 Nov 2024 16:15:13 +0300 Subject: [PATCH 1/8] fix: rootless dind --- Dockerfile | 1 + service.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49c659d..38fa8bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,6 +53,7 @@ ADD . /dind RUN chown -R $(id -u rootless) /dind RUN chown -R $(id -u rootless) /var/run +RUN chown -R $(id -u rootless) /run/user RUN chown -R $(id -u rootless) /etc/ssl && chmod 777 -R /etc/ssl USER rootless diff --git a/service.yaml b/service.yaml index 6b1d04c..548fadd 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.28.8 +version: 1.28.9 From 171cec1db4c0dbd8f122c1a96c3c5a1a1316c1f4 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 13 Nov 2024 16:21:37 +0300 Subject: [PATCH 2/8] fix: rootless dind From ccab1a8830277bb9f23a600c00f61baefbcb17cf Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 13 Nov 2024 16:24:04 +0300 Subject: [PATCH 3/8] fix: rootless dind From 5da3727a2908546f50ce47f06b434402849e0123 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 13 Nov 2024 23:47:28 +0300 Subject: [PATCH 4/8] fix: rootless dind --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 38fa8bd..3c25b50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,5 +57,8 @@ RUN chown -R $(id -u rootless) /run/user RUN chown -R $(id -u rootless) /etc/ssl && chmod 777 -R /etc/ssl USER rootless -RUN rm -i -f /var/run && ln -s /run/user/1000 /var/run +RUN rm -i -f /var/run && \ + ln -s /run/user/1000 /var/run && \ + ln -s /run/user/1000/docker.pid /var/run/docker.pid && \ + ln -s /run/user/1000/docker.sock /var/run/docker.sock ENTRYPOINT ["./run.sh"] From 274507b82e785991f28d76c358f3750dfb9f2ed7 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 13 Nov 2024 23:55:29 +0300 Subject: [PATCH 5/8] fix: rootless dind --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c25b50..49c659d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,12 +53,8 @@ ADD . /dind RUN chown -R $(id -u rootless) /dind RUN chown -R $(id -u rootless) /var/run -RUN chown -R $(id -u rootless) /run/user RUN chown -R $(id -u rootless) /etc/ssl && chmod 777 -R /etc/ssl USER rootless -RUN rm -i -f /var/run && \ - ln -s /run/user/1000 /var/run && \ - ln -s /run/user/1000/docker.pid /var/run/docker.pid && \ - ln -s /run/user/1000/docker.sock /var/run/docker.sock +RUN rm -i -f /var/run && ln -s /run/user/1000 /var/run ENTRYPOINT ["./run.sh"] From 1bb2ba4b6352b0db0c11f6169bffa028f8e2369d Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 14 Nov 2024 12:34:01 +0300 Subject: [PATCH 6/8] fix: rootless dind --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49c659d..da6736b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,8 +53,8 @@ ADD . /dind RUN chown -R $(id -u rootless) /dind RUN chown -R $(id -u rootless) /var/run +RUN chown -R $(id -u rootless) /run/user/1000 RUN chown -R $(id -u rootless) /etc/ssl && chmod 777 -R /etc/ssl USER rootless -RUN rm -i -f /var/run && ln -s /run/user/1000 /var/run ENTRYPOINT ["./run.sh"] From d7f120235a41f101f6c22f78bfd2068b9ddf4d96 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 14 Nov 2024 12:36:28 +0300 Subject: [PATCH 7/8] fix: rootless dind --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index da6736b..b620cee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,6 @@ ADD . /dind RUN chown -R $(id -u rootless) /dind RUN chown -R $(id -u rootless) /var/run -RUN chown -R $(id -u rootless) /run/user/1000 RUN chown -R $(id -u rootless) /etc/ssl && chmod 777 -R /etc/ssl USER rootless From f0beb008a16c52d951661fa8e718a112eb81c11e Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 14 Nov 2024 14:09:23 +0300 Subject: [PATCH 8/8] fix: rootless dind