Merge pull request #5909 from thaJeztah/move_winresources

move winresources into cmd/docker
This commit is contained in:
Sebastiaan van Stijn
2025-03-10 16:30:38 +01:00
committed by GitHub
11 changed files with 17 additions and 17 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
//go:build windows && 386
//go:generate goversioninfo -o=../../cli/winresources/resource.syso -icon=winresources/docker.ico -manifest=winresources/docker.exe.manifest ../../cli/winresources/versioninfo.json
//go:generate goversioninfo -o=./winresources/resource.syso -icon=internal/assets/docker.ico -manifest=internal/assets/docker.exe.manifest ./winresources/versioninfo.json
package main
import _ "github.com/docker/cli/cli/winresources"
import _ "github.com/docker/cli/cmd/docker/winresources"
+2 -2
View File
@@ -1,7 +1,7 @@
//go:build windows && amd64
//go:generate goversioninfo -64=true -o=../../cli/winresources/resource.syso -icon=winresources/docker.ico -manifest=winresources/docker.exe.manifest ../../cli/winresources/versioninfo.json
//go:generate goversioninfo -64=true -o=./winresources/resource.syso -icon=internal/assets/docker.ico -manifest=internal/assets/docker.exe.manifest ./winresources/versioninfo.json
package main
import _ "github.com/docker/cli/cli/winresources"
import _ "github.com/docker/cli/cmd/docker/winresources"
+2 -2
View File
@@ -1,7 +1,7 @@
//go:build windows && arm
//go:generate goversioninfo -arm=true -o=../../cli/winresources/resource.syso -icon=winresources/docker.ico -manifest=winresources/docker.exe.manifest ../../cli/winresources/versioninfo.json
//go:generate goversioninfo -arm=true -o=./winresources/resource.syso -icon=internal/assets/docker.ico -manifest=internal/assets/docker.exe.manifest ./winresources/versioninfo.json
package main
import _ "github.com/docker/cli/cli/winresources"
import _ "github.com/docker/cli/cmd/docker/winresources"
+2 -2
View File
@@ -1,7 +1,7 @@
//go:build windows && arm64
//go:generate goversioninfo -arm=true -64=true -o=../../cli/winresources/resource.syso -icon=winresources/docker.ico -manifest=winresources/docker.exe.manifest ../../cli/winresources/versioninfo.json
//go:generate goversioninfo -arm=true -64=true -o=./winresources/resource.syso -icon=internal/assets/docker.ico -manifest=internal/assets/docker.exe.manifest ./winresources/versioninfo.json
package main
import _ "github.com/docker/cli/cli/winresources"
import _ "github.com/docker/cli/cmd/docker/winresources"

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

+11
View File
@@ -0,0 +1,11 @@
// Package winresources is used to embed Windows resources into docker.exe.
//
// These resources are used to provide:
// * Version information
// * An icon
// * A Windows manifest declaring Windows version support
//
// The resource object files are generated when building with goversioninfo
// in scripts/build/binary and are located in cmd/docker/winresources.
// This occurs automatically when you build against Windows OS.
package winresources