github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-09-21 01:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Rely on Go-maintained commit value instead of handling that ourselves

Browse Source 
Should not change behavior

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2025-02-13 00:55:44 +01:00
parent 509ed8e1a4
commit afc0c0f021
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -81,10 +81,8 @@ endif
CONTAINER_GOSRC = /src/github.com/containers/skopeo CONTAINER_GOSRC = /src/github.com/containers/skopeo
CONTAINER_RUN ?= $(CONTAINER_CMD) --security-opt label=disable -v $(CURDIR):$(CONTAINER_GOSRC) -w $(CONTAINER_GOSRC) $(SKOPEO_CIDEV_CONTAINER_FQIN) CONTAINER_RUN ?= $(CONTAINER_CMD) --security-opt label=disable -v $(CURDIR):$(CONTAINER_GOSRC) -w $(CONTAINER_GOSRC) $(SKOPEO_CIDEV_CONTAINER_FQIN)
GIT_COMMIT := $(shell GIT_CEILING_DIRECTORIES=$$(cd ..; pwd) git rev-parse HEAD 2> /dev/null || true)
EXTRA_LDFLAGS ?= EXTRA_LDFLAGS ?=
SKOPEO_LDFLAGS := -ldflags '-X main.gitCommit=${GIT_COMMIT} $(EXTRA_LDFLAGS)' SKOPEO_LDFLAGS := -ldflags '$(EXTRA_LDFLAGS)'
MANPAGES_MD = $(wildcard docs/*.md) MANPAGES_MD = $(wildcard docs/*.md)
MANPAGES ?= $(MANPAGES_MD:%.md=%) MANPAGES ?= $(MANPAGES_MD:%.md=%)

25
cmd/skopeo/main.go
View File

@@ -3,6 +3,7 @@ package main
import ( import (
"context" "context"
"fmt" "fmt"
"runtime/debug"
"strings" "strings"
"time" "time"
@@ -15,10 +16,6 @@ import (
"go.podman.io/storage/pkg/reexec" "go.podman.io/storage/pkg/reexec"
) )
// gitCommit will be the hash that the binary was built from
// and will be populated by the Makefile
var gitCommit = ""
var defaultUserAgent = "skopeo/" + version.Version var defaultUserAgent = "skopeo/" + version.Version
type globalOptions struct { type globalOptions struct {
@@ -70,8 +67,10 @@ func createApp() (*cobra.Command, *globalOptions) {
// (skopeo --tls-verify inspect) (causes a warning) and (skopeo inspect --tls-verify) (no warning). // (skopeo --tls-verify inspect) (causes a warning) and (skopeo inspect --tls-verify) (no warning).
TraverseChildren: true, TraverseChildren: true,
} }
if gitCommit != "" { // We don’t use debug.ReadBuildInfo to automate version.Version, because that would not work well for builds from
rootCommand.Version = fmt.Sprintf("%s commit: %s", version.Version, gitCommit) // a released tarball (e.g. RPM builds).
if commit := gitCommit(); commit != "" {
rootCommand.Version = fmt.Sprintf("%s commit: %s", version.Version, commit)
} else { } else {
rootCommand.Version = version.Version rootCommand.Version = version.Version
} }
@@ -112,6 +111,20 @@ func createApp() (*cobra.Command, *globalOptions) {
return rootCommand, &opts return rootCommand, &opts
} }
// gitCommit returns the git commit for this codebase, if we are built from a git repo; "" otherwise.
func gitCommit() string {
bi, ok := debug.ReadBuildInfo()
if !ok {
logrus.Fatal("runtime.ReadBuildInfo failed")
}
for _, e := range bi.Settings {
if e.Key == "vcs.revision" {
return e.Value
}
}
return ""
}
// before is run by the cli package for any command, before running the command-specific handler. // before is run by the cli package for any command, before running the command-specific handler.
func (opts *globalOptions) before(cmd *cobra.Command, args []string) error { func (opts *globalOptions) before(cmd *cobra.Command, args []string) error {
if opts.debug { if opts.debug {