bot_bottle/backend/macos_container/rootless_docker.py

@@ -42,8 +42,9 @@ def build_image(
             " && apt-get install -y --no-install-recommends docker.io uidmap "
             "rootlesskit slirp4netns fuse-overlayfs \\\n"
             " && rm -rf /var/lib/apt/lists/* \\\n"
-            " && echo 'node:100000:65536' >> /etc/subuid \\\n"
-            " && echo 'node:100000:65536' >> /etc/subgid \\\n"
+            " && sed -i '/^node:/d' /etc/subuid /etc/subgid \\\n"
+            " && printf 'node:100000:65536\\n' >> /etc/subuid \\\n"
+            " && printf 'node:100000:65536\\n' >> /etc/subgid \\\n"
             " && ln -s /usr/share/docker.io/contrib/dockerd-rootless.sh "
             "/usr/local/bin/dockerd-rootless.sh\n"
             "COPY rootless-docker-init.sh "

tests/unit/test_macos_rootless_docker.py

@@ -62,6 +62,9 @@ class TestRootlessDockerImage(unittest.TestCase):
             text = Path(dockerfile).read_text(encoding="utf-8")
             self.assertIn("FROM agent:base", text)
             self.assertIn("docker.io uidmap rootlesskit slirp4netns", text)
+            self.assertIn("sed -i '/^node:/d' /etc/subuid /etc/subgid", text)
+            self.assertEqual(1, text.count("node:100000:65536\\n' >> /etc/subuid"))
+            self.assertEqual(1, text.count("node:100000:65536\\n' >> /etc/subgid"))
             self.assertIn("USER node", text)
             self.assertTrue((Path(context) / "rootless-docker-init.sh").is_file())