Skip to content

Commit

Permalink
Rename 'platform' field to 'edition' as per code-review feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Rodny Molina <rmolina@nestybox.com>
  • Loading branch information
rodnymolina committed Mar 26, 2021
1 parent 0258bef commit df952e5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ LIBSECCOMP_SRC := $(shell find $(LIBSECCOMP_DIR) 2>&1 | grep -E '.*\.(go)')

SHIFTFS_MODULE_PRESENT = $(shell lsmod | grep shiftfs)

LDFLAGS := '-X "main.platform=${PLATFORM}" -X main.version=${VERSION} \
LDFLAGS := '-X "main.edition=${EDITION}" -X main.version=${VERSION} \
-X main.commitId=$(COMMIT) -X "main.builtAt=$(BUILT_AT)" \
-X "main.builtBy=$(BUILT_BY)"'

Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

// Globals to be populated at build time during Makefile processing.
var (
platform string // Sysbox Platform: CE or EE
edition string // Sysbox Edition: CE or EE
version string // extracted from VERSION file
commitId string // latest sysbox-runc's git commit-id
builtAt string // build time
Expand All @@ -40,13 +40,13 @@ func main() {
// show-version specialization.
cli.VersionPrinter = func(c *cli.Context) {
fmt.Printf("sysbox-runc\n"+
"\tplatform: \t%s\n"+
"\tedition: \t%s\n"+
"\tversion: \t%s\n"+
"\tcommit: \t%s\n"+
"\tbuilt at: \t%s\n"+
"\tbuilt by: \t%s\n"+
"\toci-specs: \t%s\n",
platform, c.App.Version, commitId, builtAt, builtBy, specs.Version)
edition, c.App.Version, commitId, builtAt, builtBy, specs.Version)
}

xdgRuntimeDir := ""
Expand Down

0 comments on commit df952e5

Please sign in to comment.