move winresources into cmd/docker

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

.dockerignore

@@ -1,6 +1,6 @@
 /build/
-/cli/winresources/versioninfo.json
-/cli/winresources/*.syso
+/cmd/docker/winresources/versioninfo.json
+/cmd/docker/winresources/*.syso
 /man/man*/
 /man/vendor/
 /man/go.sum

.gitignore

@@ -8,8 +8,8 @@
 Thumbs.db
 .editorconfig
 /build/
-/cli/winresources/versioninfo.json
-/cli/winresources/*.syso
+/cmd/docker/winresources/versioninfo.json
+/cmd/docker/winresources/*.syso
 profile.out
 
 # top-level go.mod is not meant to be checked in

Dockerfile

@@ -67,7 +67,7 @@ ARG PACKAGER_NAME
 COPY --link --from=goversioninfo /out/goversioninfo /usr/bin/goversioninfo
 RUN --mount=type=bind,target=.,ro \
     --mount=type=cache,target=/root/.cache \
-    --mount=type=tmpfs,target=cli/winresources \
+    --mount=type=tmpfs,target=cmd/docker/winresources \
     # override the default behavior of go with xx-go
     xx-go --wrap && \
     # export GOCACHE=$(go env GOCACHE)/$(xx-info)$([ -f /etc/alpine-release ] && echo "alpine") && \

cmd/docker/docker_windows_386.go

@@ -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"

cmd/docker/docker_windows_amd64.go

@@ -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"

cmd/docker/docker_windows_arm.go

@@ -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"

cmd/docker/docker_windows_arm64.go

@@ -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"

scripts/build/mkversioninfo

@@ -21,7 +21,7 @@ VERSION_QUAD=$(printf "%s" "$VERSION" | sed -re 's/^([0-9.]*).*$/\1/' | sed -re
 # Microsoft Windows Version Information and an icon using goversioninfo.
 # https://docs.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-block
 # https://github.com/josephspurrier/goversioninfo/blob/master/testdata/resource/versioninfo.json
-cat > ./cli/winresources/versioninfo.json <<EOL
+cat > ./cmd/docker/winresources/versioninfo.json <<EOL
 {
   "FixedFileInfo":
   {
@@ -61,9 +61,9 @@ cat > ./cli/winresources/versioninfo.json <<EOL
   }
 }
 EOL
-(set -x ; cat ./cli/winresources/versioninfo.json)
+(set -x ; cat ./cmd/docker/winresources/versioninfo.json)
 
 # Create winresources package stub if removed while using tmpfs in Dockerfile
-if [ ! -f "./cli/winresources/winresources.go" ]; then
-  echo "package winresources" > "./cli/winresources/winresources.go"
+if [ ! -f "./cmd/docker/winresources/winresources.go" ]; then
+  echo "package winresources" > "./cmd/docker/winresources/winresources.go"
 fi