This repository has been archived by the owner on Nov 27, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Do not strip "v" prefix from version when printing
I noticed this when building the binary; `internal.Version` is set to `v2.0.0-beta.4`, to match the tag. ```bash GIT_TAG=v2.0.0-beta.4 make COMPOSE_BINARY=bin/docker-compose -f builder.Makefile compose-plugin \ GOOS=linux \ GOARCH=amd64 \ CGO_ENABLED=0 \ go build \ -trimpath \ -ldflags="-s -w -X github.com/docker/compose-cli/internal.Version=v2.0.0-beta.4" \ -o bin/docker-compose \ ./cmd ``` However, the binary has the `v` prefix stripped (which caused a check to fail when packaging): ```bash /root/rpmbuild/BUILDROOT/docker-compose-plugin-2.0.0.beta.4-0.fc34.x86_64/usr/libexec/docker/cli-plugins/docker-compose docker-cli-plugin-metadata ++ awk '{ gsub(/[",:]/,"")}; $1 == "Version" { print $2 }' + ver=2.0.0-beta.4 + test 2.0.0-beta.4 = v2.0.0-beta.4 FAIL: docker-compose version (2.0.0-beta.4) did not match ``` This also looks inconsistent with other binaries and plugins we ship: ```bash docker info --format '{{json .ClientInfo.Plugins}}' | jq . [ { "SchemaVersion": "0.1.0", "Vendor": "Docker Inc.", "Version": "v0.5.1-docker", "ShortDescription": "Build with BuildKit", "Name": "buildx", "Path": "/usr/libexec/docker/cli-plugins/docker-buildx" }, { "SchemaVersion": "0.1.0", "Vendor": "Docker Inc.", "Version": "2.0.0-beta.4", "ShortDescription": "Docker Compose", "Name": "compose", "Path": "/usr/libexec/docker/cli-plugins/docker-compose" }, { "SchemaVersion": "0.1.0", "Vendor": "Docker Inc.", "Version": "v0.8.0", "ShortDescription": "Docker Scan", "Name": "scan", "Path": "/usr/libexec/docker/cli-plugins/docker-scan" } ] ``` Perhaps there was a specific reason for this, but thought I'd open this PR for discussion (if the v-prefix should not be there, perhaps we should isntead strip it when setting the version). Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- Loading branch information