Merge pull request #39901 from thaJeztah/remove_docker_cli_autogen

hack/make: remove autogen resources for Docker CLI

daemon/daemon_windows.go

@@ -218,7 +218,7 @@ func verifyDaemonSettings(config *config.Config) error {
 
 // checkSystem validates platform-specific requirements
 func checkSystem() error {
-	// Validate the OS version. Note that docker.exe must be manifested for this
+	// Validate the OS version. Note that dockerd.exe must be manifested for this
 	// call to return the correct version.
 	osv := system.GetOSVersion()
 	if osv.MajorVersion < 10 {

hack/make/.go-autogen

@@ -44,8 +44,7 @@ DVEOF
 
 # Compile the Windows resources into the sources
 if [ "$(go env GOOS)" = "windows" ]; then
-	mkdir -p autogen/winresources/tmp autogen/winresources/docker autogen/winresources/dockerd
-	cp hack/make/.resources-windows/resources.go autogen/winresources/docker/
+	mkdir -p autogen/winresources/tmp autogen/winresources/dockerd
 	cp hack/make/.resources-windows/resources.go autogen/winresources/dockerd/
 
 	if [ "$(go env GOHOSTOS)" == "windows" ]; then
@@ -81,8 +80,6 @@ if [ "$(go env GOOS)" = "windows" ]; then
 		-h autogen/winresources/tmp \
 		-r autogen/winresources/tmp
 
-	makeres docker.rc pe-x86-64 autogen/winresources/docker/rsrc_amd64.syso
-	makeres docker.rc pe-i386 autogen/winresources/docker/rsrc_386.syso
 	makeres dockerd.rc pe-x86-64 autogen/winresources/dockerd/rsrc_amd64.syso
 
 	rm -r autogen/winresources/tmp

hack/make/.go-autogen.ps1

@@ -60,9 +60,7 @@ const (
     [System.IO.File]::WriteAllText($outputFile, $fileContents, (New-Object System.Text.UTF8Encoding($False)))
 
     New-Item -ItemType Directory -Path "autogen\winresources\tmp" | Out-Null
-    New-Item -ItemType Directory -Path "autogen\winresources\docker" | Out-Null
     New-Item -ItemType Directory -Path "autogen\winresources\dockerd" | Out-Null
-    Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\docker"
     Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\dockerd"
 
     # Generate a version in the form major,minor,patch,build
@@ -77,12 +75,6 @@ const (
     $env:_ag_dockerVersion=$DockerVersion
     $env:_ag_gitCommit=$CommitString
 
-    windres -i hack/make/.resources-windows/docker.rc  -o autogen/winresources/docker/rsrc_amd64.syso  -F pe-x86-64 --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client 64-bit resources" }
-
-    windres -i hack/make/.resources-windows/docker.rc  -o autogen/winresources/docker/rsrc_386.syso    -F pe-i386   --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client 32-bit resources" }
-
     windres -i hack/make/.resources-windows/dockerd.rc -o autogen/winresources/dockerd/rsrc_amd64.syso -F pe-x86-64 --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
     if ($LASTEXITCODE -ne 0) { Throw "Failed to compile daemon resources" }
 }

hack/make/.resources-windows/common.rc

@@ -1,8 +1,8 @@
 // Application icon
-1 ICON "docker.ico"
+1 ICON "dockerd.ico"
 
 // Windows executable manifest
-1 24 /* RT_MANIFEST */ "docker.exe.manifest"
+1 24 /* RT_MANIFEST */ "dockerd.exe.manifest"
 
 // Version information
 1 VERSIONINFO

hack/make/.resources-windows/docker.rc

@@ -1,3 +0,0 @@
-#define DOCKER_NAME "Docker Client"
-
-#include "common.rc"

hack/make/.resources-windows/resources.go

@@ -1,6 +1,6 @@
 /*
 
-Package winresources is used to embed Windows resources into docker.exe.
+Package winresources is used to embed Windows resources into dockerd.exe.
 These resources are used to provide
 
     * Version information

pkg/parsers/kernel/kernel_windows.go

@@ -36,7 +36,7 @@ func GetKernelVersion() (*VersionInfo, error) {
 	}
 	KVI.kvi = blex
 
-	// Important - docker.exe MUST be manifested for this API to return
+	// Important - dockerd.exe MUST be manifested for this API to return
 	// the correct information.
 	dwVersion, err := windows.GetVersion()
 	if err != nil {

pkg/system/syscall_windows.go

@@ -84,7 +84,7 @@ type osVersionInfoEx struct {
 }
 
 // GetOSVersion gets the operating system version on Windows. Note that
-// docker.exe must be manifested to get the correct version information.
+// dockerd.exe must be manifested to get the correct version information.
 func GetOSVersion() OSVersion {
 	var err error
 	osv := OSVersion{}