ci/cd:inculde binary type in version information

This commit is contained in:
Shivam Mishra
2021-02-12 16:52:02 -08:00
committed by Ramkumar Chinchani
parent a7c17b7c16
commit cf25c6f3c8
3 changed files with 17 additions and 11 deletions
+12 -7
View File
@@ -8,8 +8,11 @@ import (
dspec "github.com/opencontainers/distribution-spec"
)
// Commit ...
var Commit string //nolint: gochecknoglobals
// Global vars...
var (
Commit string // nolint: gochecknoglobals
BinaryType string // nolint: gochecknoglobals
)
type StorageConfig struct {
RootDirectory string
@@ -72,6 +75,7 @@ type LogConfig struct {
type Config struct {
Version string
Commit string
BinaryType string
Storage StorageConfig
HTTP HTTPConfig
Log *LogConfig
@@ -80,11 +84,12 @@ type Config struct {
func NewConfig() *Config {
return &Config{
Version: dspec.Version,
Commit: Commit,
Storage: StorageConfig{GC: true, Dedupe: true},
HTTP: HTTPConfig{Address: "127.0.0.1", Port: "8080"},
Log: &LogConfig{Level: "debug"},
Version: dspec.Version,
Commit: Commit,
BinaryType: BinaryType,
Storage: StorageConfig{GC: true, Dedupe: true},
HTTP: HTTPConfig{Address: "127.0.0.1", Port: "8080"},
Log: &LogConfig{Level: "debug"},
}
}
+2 -1
View File
@@ -88,7 +88,8 @@ func NewRootCmd() *cobra.Command {
Long: "`zot`",
Run: func(cmd *cobra.Command, args []string) {
if showVersion {
log.Info().Str("distribution-spec", dspec.Version).Str("commit", api.Commit).Msg("version")
log.Info().Str("distribution-spec", dspec.Version).Str("commit", api.Commit).
Str("binary-type", api.BinaryType).Msg("version")
}
_ = cmd.Usage()
},