From 44e5100232b2070cc73f251febe9997b100dc3c7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 8 Mar 2025 21:37:42 +0100 Subject: [PATCH] move winresources into cmd/docker Signed-off-by: Sebastiaan van Stijn --- .dockerignore | 4 ++-- .gitignore | 4 ++-- Dockerfile | 2 +- cmd/docker/docker_windows_386.go | 4 ++-- cmd/docker/docker_windows_amd64.go | 4 ++-- cmd/docker/docker_windows_arm.go | 4 ++-- cmd/docker/docker_windows_arm64.go | 4 ++-- .../assets}/docker.exe.manifest | 0 .../{winresources => internal/assets}/docker.ico | Bin {cli => cmd/docker}/winresources/winresources.go | 0 scripts/build/mkversioninfo | 8 ++++---- 11 files changed, 17 insertions(+), 17 deletions(-) rename cmd/docker/{winresources => internal/assets}/docker.exe.manifest (100%) rename cmd/docker/{winresources => internal/assets}/docker.ico (100%) rename {cli => cmd/docker}/winresources/winresources.go (100%) diff --git a/.dockerignore b/.dockerignore index 57b2e28bf1..905ef55cd6 100644 --- a/.dockerignore +++ b/.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 diff --git a/.gitignore b/.gitignore index c9ca65fef0..a9c2d9d3ab 100644 --- a/.gitignore +++ b/.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 diff --git a/Dockerfile b/Dockerfile index d2864f7e64..4a880c63ea 100644 --- a/Dockerfile +++ b/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") && \ diff --git a/cmd/docker/docker_windows_386.go b/cmd/docker/docker_windows_386.go index d9d1e37da0..0370eee418 100644 --- a/cmd/docker/docker_windows_386.go +++ b/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" diff --git a/cmd/docker/docker_windows_amd64.go b/cmd/docker/docker_windows_amd64.go index e88aa253ba..455f4f5759 100644 --- a/cmd/docker/docker_windows_amd64.go +++ b/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" diff --git a/cmd/docker/docker_windows_arm.go b/cmd/docker/docker_windows_arm.go index f2eff4f1d7..ac452c64bb 100644 --- a/cmd/docker/docker_windows_arm.go +++ b/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" diff --git a/cmd/docker/docker_windows_arm64.go b/cmd/docker/docker_windows_arm64.go index 15a6e31433..318011c9dc 100644 --- a/cmd/docker/docker_windows_arm64.go +++ b/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" diff --git a/cmd/docker/winresources/docker.exe.manifest b/cmd/docker/internal/assets/docker.exe.manifest similarity index 100% rename from cmd/docker/winresources/docker.exe.manifest rename to cmd/docker/internal/assets/docker.exe.manifest diff --git a/cmd/docker/winresources/docker.ico b/cmd/docker/internal/assets/docker.ico similarity index 100% rename from cmd/docker/winresources/docker.ico rename to cmd/docker/internal/assets/docker.ico diff --git a/cli/winresources/winresources.go b/cmd/docker/winresources/winresources.go similarity index 100% rename from cli/winresources/winresources.go rename to cmd/docker/winresources/winresources.go diff --git a/scripts/build/mkversioninfo b/scripts/build/mkversioninfo index 8bc30edbd1..b349e92266 100755 --- a/scripts/build/mkversioninfo +++ b/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 < ./cmd/docker/winresources/versioninfo.json < ./cli/winresources/versioninfo.json < "./cli/winresources/winresources.go" +if [ ! -f "./cmd/docker/winresources/winresources.go" ]; then + echo "package winresources" > "./cmd/docker/winresources/winresources.go" fi