Merge pull request #3511 from BenTheElder/binfmt2

disable systemd-binfmt.service
kubernetes-sigs · Feb 12, 2024 · 2ad380d · 2ad380d
2 parents f53c9d0 + 07484ab
commit 2ad380d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
@@ -86,10 +86,12 @@ RUN echo "Installing Packages ..." \
     && echo "ReadKMsg=no" >> /etc/systemd/journald.conf \
     && ln -s "$(which systemd)" /sbin/init
 
-RUN echo "Enabling services ... " \
+# NOTE: systemd-binfmt.service will register things into binfmt_misc which is kernel-global
+RUN echo "Enabling / Disabling services ... " \
     && systemctl enable kubelet.service \
     && systemctl enable containerd.service \
-    && systemctl enable undo-mount-hacks.service
+    && systemctl enable undo-mount-hacks.service \
+    && systemctl mask systemd-binfmt.service
 
 RUN echo "Ensuring /etc/kubernetes/manifests" \
     && mkdir -p /etc/kubernetes/manifests