From 3f7c09e601e5d95f942542d8b00f2cc42b3dafa6 Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Mon, 26 Oct 2020 11:08:12 -0700 Subject: [PATCH] pause image: Disable DiagTrack service on Windows image It has been observed that the DiagTrack service in the pause image is consuming a non-trivial amount of CPU. We don't need this service in the pause image, so we should disable it. We can disable the service by running chntpw in a docker buildx Linux stage and then copy the SYSTEM file back to the final Windows image. Co-Authored-By: Mark Rossetti Co-Authored-By: Davanum Srinivas --- build/pause/Dockerfile_windows | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/pause/Dockerfile_windows b/build/pause/Dockerfile_windows index 81b6ddd58b6..9a0ebca596a 100644 --- a/build/pause/Dockerfile_windows +++ b/build/pause/Dockerfile_windows @@ -18,6 +18,11 @@ ARG ARCH ADD bin/pause-windows-${ARCH}.exe /pause.exe ADD bin/wincat-windows-amd64 /Windows/System32/wincat.exe +# NOTE(claudiub): We're replacing the diagtrack.dll as a means to disable the +# DiagTrack service (it cannot run without this DLL). We do not need this +# service in the pause image and there's no reason for it to have any CPU usage. +ADD windows/pause.c /Windows/System32/diagtrack.dll + # NOTE(claudiub): docker buildx sets the PATH env variable to a Linux-like PATH, # which is not desirable. See: https://github.com/moby/buildkit/issues/1560 # TODO(claudiub): remove this once the issue has been resolved.