1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move winresources into cmd/docker

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2025-03-08 21:37:42 +01:00
parent 2eec74659e
commit 44e5100232
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.dockerignore
View File

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

4
.gitignore vendored
View File

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

2
Dockerfile
View File

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

4
cmd/docker/docker_windows_386.go
View File

@ -1,7 +1,7 @@
//go:build windows && 386 //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 package main
import _ "github.com/docker/cli/cli/winresources" import _ "github.com/docker/cli/cmd/docker/winresources"

4
cmd/docker/docker_windows_amd64.go
View File

@ -1,7 +1,7 @@
//go:build windows && amd64 //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 package main
import _ "github.com/docker/cli/cli/winresources" import _ "github.com/docker/cli/cmd/docker/winresources"

4
cmd/docker/docker_windows_arm.go
View File

@ -1,7 +1,7 @@
//go:build windows && arm //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 package main
import _ "github.com/docker/cli/cli/winresources" import _ "github.com/docker/cli/cmd/docker/winresources"

4
cmd/docker/docker_windows_arm64.go
View File

@ -1,7 +1,7 @@
//go:build windows && arm64 //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 package main
import _ "github.com/docker/cli/cli/winresources" import _ "github.com/docker/cli/cmd/docker/winresources"

0
cmd/docker/winresources/docker.exe.manifest → cmd/docker/internal/assets/docker.exe.manifest
View File

0
cmd/docker/winresources/docker.ico → cmd/docker/internal/assets/docker.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

0
cli/winresources/winresources.go → cmd/docker/winresources/winresources.go
View File

8
scripts/build/mkversioninfo
View File

@ -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. # Microsoft Windows Version Information and an icon using goversioninfo.
# https://docs.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-block # https://docs.microsoft.com/en-us/windows/win32/menurc/stringfileinfo-block
# https://github.com/josephspurrier/goversioninfo/blob/master/testdata/resource/versioninfo.json # 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": "FixedFileInfo":
{ {
@ -61,9 +61,9 @@ cat > ./cli/winresources/versioninfo.json <<EOL
} }
} }
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 # Create winresources package stub if removed while using tmpfs in Dockerfile
if [ ! -f "./cli/winresources/winresources.go" ]; then if [ ! -f "./cmd/docker/winresources/winresources.go" ]; then
echo "package winresources" > "./cli/winresources/winresources.go" echo "package winresources" > "./cmd/docker/winresources/winresources.go"
fi fi