tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #289 from gtardif/automate_version_from_tag 

Automate version from tag
This commit is contained in:
Guillaume Tardif 2020-06-25 15:58:00 +02:00 committed by GitHub
parent 53505cc44e 0bcba8d1d2
commit 4fb039164d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builder.Makefile
View File

@ -23,7 +23,9 @@ ifeq ($(GOOS),windows)
endif
STATIC_FLAGS=CGO_ENABLED=0
LDFLAGS:="-s -w"
GIT_TAG=$(shell git describe --tags --match "v[0-9]*")
LDFLAGS="-s -w -X main.version=${GIT_TAG}"
GO_BUILD=$(STATIC_FLAGS) go build -trimpath -ldflags=$(LDFLAGS)
BINARY?=bin/docker
@ -37,18 +39,18 @@ endif
all: cli
protos:
@protoc -I. --go_out=plugins=grpc,paths=source_relative:. ${PROTOS}
protoc -I. --go_out=plugins=grpc,paths=source_relative:. ${PROTOS}
cli:
GOOS=${GOOS} GOARCH=${GOARCH} $(GO_BUILD) $(TAGS) -o $(BINARY_WITH_EXTENSION) ./cli
cross:
@GOOS=linux GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(BINARY)-linux-amd64 ./cli
@GOOS=darwin GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(BINARY)-darwin-amd64 ./cli
@GOOS=windows GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(BINARY)-windows-amd64.exe ./cli
GOOS=linux GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(BINARY)-linux-amd64 ./cli
GOOS=darwin GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(BINARY)-darwin-amd64 ./cli
GOOS=windows GOARCH=amd64 $(GO_BUILD) $(TAGS) -o $(BINARY)-windows-amd64.exe ./cli
test:
@go test $(TAGS) -cover $(shell go list ./... | grep -vE 'e2e')
go test $(TAGS) -cover $(shell go list ./... | grep -vE 'e2e')
lint:
golangci-lint run --timeout 10m0s ./...

13
cli/cmd/version.go
View File

@ -26,15 +26,15 @@ import (
"github.com/docker/api/cli/mobycli"
)
const cliVersion = "0.1.4"
// VersionCommand command to display version
func VersionCommand() *cobra.Command {
func VersionCommand(version string) *cobra.Command {
cmd := &cobra.Command{
Use: "version",
Short: "Show the Docker version information",
Args: cobra.MaximumNArgs(0),
RunE: runVersion,
RunE: func(cmd *cobra.Command, _ []string) error {
return runVersion(cmd, version)
},
}
// define flags for backward compatibility with com.docker.cli
flags := cmd.Flags()
@ -45,7 +45,8 @@ func VersionCommand() *cobra.Command {
return cmd
}
func runVersion(cmd *cobra.Command, args []string) error {
func runVersion(cmd *cobra.Command, version string) error {
displayedVersion := strings.TrimPrefix(version, "v")
versionResult, _ := mobycli.ExecSilent(cmd.Context())
// we don't want to fail on error, there is an error if the engine is not available but it displays client version info
// Still, technically the [] byte versionResult could be nil, just let the original command display what it has to display
@ -53,6 +54,6 @@ func runVersion(cmd *cobra.Command, args []string) error {
return mobycli.ExecCmd(cmd)
}
var s string = string(versionResult)
fmt.Print(strings.Replace(s, "\n Version:", "\n Azure integration "+cliVersion+"\n Version:", 1))
fmt.Print(strings.Replace(s, "\n Version:", "\n Azure integration "+displayedVersion+"\n Version:", 1))
return nil
}

6
cli/main.go
View File

@ -49,6 +49,10 @@ import (
"github.com/docker/api/context/store"
)
var (
version = "dev"
)
var (
ownCommands = map[string]struct{}{
"context": {},
@ -110,7 +114,7 @@ func main() {
cmd.InspectCommand(),
compose.Command(),
login.Command(),
cmd.VersionCommand(),
cmd.VersionCommand(version),
)
helpFunc := root.HelpFunc()