From 2932d316f9d0881a8a4c327c3c13d764ad34ad68 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 10 Jan 2023 13:54:22 +0100
Subject: [PATCH] WIP: move winresources into cmd package

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .dockerignore                                       |   4 ++--
 .gitignore                                          |   4 ++--
 Dockerfile                                          |   4 ++--
 cmd/docker-proxy/genwinres_windows.go               |   4 ++--
 .../docker-proxy/winresources}/winresources.go      |   0
 cmd/dockerd/genwinres_windows.go                    |   4 ++--
 .../dockerd/winresources}/winresources.go           |   0
 {cli => cmd}/winresources/README.md                 |   0
 {cli => cmd}/winresources/docker.ico                | Bin
 {cli => cmd}/winresources/event_messages.bin        | Bin
 {cli => cmd}/winresources/event_messages.mc         |   0
 hack/make/.go-autogen.ps1                           |   4 ++--
 hack/make/.mkwinres                                 |  12 ++++++------
 13 files changed, 18 insertions(+), 18 deletions(-)
 rename {cli/winresources/docker-proxy => cmd/docker-proxy/winresources}/winresources.go (100%)
 rename {cli/winresources/dockerd => cmd/dockerd/winresources}/winresources.go (100%)
 rename {cli => cmd}/winresources/README.md (100%)
 rename {cli => cmd}/winresources/docker.ico (100%)
 rename {cli => cmd}/winresources/event_messages.bin (100%)
 rename {cli => cmd}/winresources/event_messages.mc (100%)

diff --git a/.dockerignore b/.dockerignore
index 71c1853815..a1f0403b40 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,4 @@
 .git
 bundles/
-cli/winresources/**/winres.json
-cli/winresources/**/*.syso
+cmd/*/winresources/*.syso
+cmd/*/winresources/winres.json
diff --git a/.gitignore b/.gitignore
index 9b2c8b9c51..c843980084 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,8 @@ thumbs.db
 
 # build artifacts
 bundles/
-cli/winresources/*/*.syso
-cli/winresources/*/winres.json
+cmd/*/winresources/*.syso
+cmd/*/winresources/winres.json
 contrib/builder/rpm/*/changelog
 
 # ci artifacts
diff --git a/Dockerfile b/Dockerfile
index 25e5198ebc..18825058f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -608,8 +608,8 @@ RUN <<EOT
   fi
 EOT
 RUN --mount=type=bind,target=.,rw \
-    --mount=type=tmpfs,target=cli/winresources/dockerd \
-    --mount=type=tmpfs,target=cli/winresources/docker-proxy \
+    --mount=type=tmpfs,target=cmd/dockerd/winresources \
+    --mount=type=tmpfs,target=cmd/docker-proxy/winresources \
     --mount=type=cache,target=/root/.cache/go-build,id=moby-build-$TARGETPLATFORM <<EOT
   set -e
   target=$([ "$DOCKER_STATIC" = "1" ] && echo "binary" || echo "dynbinary")
diff --git a/cmd/docker-proxy/genwinres_windows.go b/cmd/docker-proxy/genwinres_windows.go
index 86697d8a57..b45281f1b7 100644
--- a/cmd/docker-proxy/genwinres_windows.go
+++ b/cmd/docker-proxy/genwinres_windows.go
@@ -1,5 +1,5 @@
-//go:generate go-winres make --arch=386,amd64,arm,arm64 --in=../../cli/winresources/docker-proxy/winres.json --out=../../cli/winresources/docker-proxy/resource
+//go:generate go-winres make --arch=386,amd64,arm,arm64 --in=winresources/winres.json --out=winresources/resource
 
 package main
 
-import _ "github.com/docker/docker/cli/winresources/docker-proxy"
+import _ "github.com/docker/docker/cmd/docker-proxy/winresources"
diff --git a/cli/winresources/docker-proxy/winresources.go b/cmd/docker-proxy/winresources/winresources.go
similarity index 100%
rename from cli/winresources/docker-proxy/winresources.go
rename to cmd/docker-proxy/winresources/winresources.go
diff --git a/cmd/dockerd/genwinres_windows.go b/cmd/dockerd/genwinres_windows.go
index dd00c662bb..5d929fffcd 100644
--- a/cmd/dockerd/genwinres_windows.go
+++ b/cmd/dockerd/genwinres_windows.go
@@ -1,5 +1,5 @@
-//go:generate go-winres make --arch=386,amd64,arm,arm64 --in=../../cli/winresources/dockerd/winres.json --out=../../cli/winresources/dockerd/resource
+//go:generate go-winres make --arch=386,amd64,arm,arm64 --in=winresources/winres.json --out=winresources/resource
 
 package main
 
-import _ "github.com/docker/docker/cli/winresources/dockerd"
+import _ "github.com/docker/docker/cmd/dockerd/winresources"
diff --git a/cli/winresources/dockerd/winresources.go b/cmd/dockerd/winresources/winresources.go
similarity index 100%
rename from cli/winresources/dockerd/winresources.go
rename to cmd/dockerd/winresources/winresources.go
diff --git a/cli/winresources/README.md b/cmd/winresources/README.md
similarity index 100%
rename from cli/winresources/README.md
rename to cmd/winresources/README.md
diff --git a/cli/winresources/docker.ico b/cmd/winresources/docker.ico
similarity index 100%
rename from cli/winresources/docker.ico
rename to cmd/winresources/docker.ico
diff --git a/cli/winresources/event_messages.bin b/cmd/winresources/event_messages.bin
similarity index 100%
rename from cli/winresources/event_messages.bin
rename to cmd/winresources/event_messages.bin
diff --git a/cli/winresources/event_messages.mc b/cmd/winresources/event_messages.mc
similarity index 100%
rename from cli/winresources/event_messages.mc
rename to cmd/winresources/event_messages.mc
diff --git a/hack/make/.go-autogen.ps1 b/hack/make/.go-autogen.ps1
index 1db8dac9bf..49aca6493d 100644
--- a/hack/make/.go-autogen.ps1
+++ b/hack/make/.go-autogen.ps1
@@ -127,13 +127,13 @@ try {
 }'
 
     # Write the file
-    $outputFile="$(Get-Location)\cli\winresources\dockerd\winres.json"
+    $outputFile="$(Get-Location)\cmd\dockerd\winresources\winres.json"
     if (Test-Path $outputFile) { Remove-Item $outputFile }
     [System.IO.File]::WriteAllText($outputFile, $mkwinresContents)
     Get-Content $outputFile | Out-Host
 
     # Create winresources package stub if removed while using tmpfs in Dockerfile
-    $stubPackage="$(Get-Location)\cli\winresources\dockerd\winresources.go"
+    $stubPackage="$(Get-Location)\cmd\dockerd\winresources.go"
     if(![System.IO.File]::Exists($stubPackage)){
         Set-Content -NoNewline -Path $stubPackage -Value 'package winresources'
     }
diff --git a/hack/make/.mkwinres b/hack/make/.mkwinres
index 70d66814c2..cb6673a9a3 100644
--- a/hack/make/.mkwinres
+++ b/hack/make/.mkwinres
@@ -16,11 +16,11 @@ VERSION_QUAD=$(printf "%s" "$VERSION" | sed -re 's/^([0-9.]*).*$/\1/' | sed -re
 # Microsoft Windows Version Information and an icon using go-winres.
 # https://docs.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-block
 # https://github.com/tc-hib/go-winres#json-format
-cat > "./cli/winresources/${BINARY_NAME}/winres.json" << EOL
+cat > "./cmd/${BINARY_NAME}/winresources/winres.json" << EOL
 {
   "RT_GROUP_ICON": {
     "#1": {
-      "0409": "../../winresources/docker.ico"
+      "0409": "winresources/docker.ico"
     }
   },
   "RT_MANIFEST": {
@@ -47,7 +47,7 @@ cat > "./cli/winresources/${BINARY_NAME}/winres.json" << EOL
   },
   "RT_MESSAGETABLE": {
     "#1": {
-      "0409": "../../winresources/event_messages.bin"
+      "0409": "winresources/event_messages.bin"
     }
   },
   "RT_VERSION": {
@@ -76,10 +76,10 @@ cat > "./cli/winresources/${BINARY_NAME}/winres.json" << EOL
 EOL
 (
 	set -x
-	cat "./cli/winresources/${BINARY_NAME}/winres.json"
+	cat "./cmd/${BINARY_NAME}/winresources/winres.json"
 )
 
 # Create winresources package stub if removed while using tmpfs in Dockerfile
-if [ ! -f "./cli/winresources/${BINARY_NAME}/winresources.go" ]; then
-	echo "package winresources" > "./cli/winresources/${BINARY_NAME}/winresources.go"
+if [ ! -f "./cmd/${BINARY_NAME}/winresources/winresources.go" ]; then
+	echo "package winresources" > "./cmd/${BINARY_NAME}/winresources/winresources.go"
 fi