Skip to content

Commit 1ceab3e

Browse files
committed
show go version and replace depricated -X syntax (which makes the build script go 1.4 incompatible)
1 parent 494235a commit 1ceab3e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

apps/docker-slim/cli.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var app *cli.App
2424

2525
func init() {
2626
app = cli.NewApp()
27-
app.Version = fmt.Sprintf("%v|%v|%v|%v|%v", runtime.GOOS, consts.APP_VERSION_NAME, appVersionTag, appVersionRev, appVersionTime)
27+
app.Version = fmt.Sprintf("%v|%v|%v|%v|%v (%v)", runtime.GOOS, consts.APP_VERSION_NAME, appVersionTag, appVersionRev, appVersionTime, runtime.Version())
2828
app.Name = APP_NAME
2929
app.Usage = APP_USAGE
3030
app.CommandNotFound = func(ctx *cli.Context, command string) {

scripts/src.build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ if hash git 2>/dev/null && [ -e $BDIR/.git ]; then
1515
tag="$(git describe --tags)"
1616
revision="$(git rev-parse HEAD)"
1717
fi
18-
gox -osarch="linux/amd64" -output="$BDIR/bin/linux/docker-slim" -ldflags="-X main.appVersionTag $tag -X main.appVersionRev $revision -X main.appVersionTime $build_time"
19-
gox -osarch="darwin/amd64" -output="$BDIR/bin/mac/docker-slim" -ldflags="-X main.appVersionTag $tag -X main.appVersionRev $revision -X main.appVersionTime $build_time"
18+
gox -osarch="linux/amd64" -output="$BDIR/bin/linux/docker-slim" -ldflags="-X main.appVersionTag=$tag -X main.appVersionRev=$revision -X main.appVersionTime=$build_time"
19+
gox -osarch="darwin/amd64" -output="$BDIR/bin/mac/docker-slim" -ldflags="-X main.appVersionTag=$tag -X main.appVersionRev=$revision -X main.appVersionTime=$build_time"
2020
#gox -osarch="linux/arm" -output="$BDIR/bin/linux_arm/docker-slim"
2121
popd
2222
pushd $BDIR/apps/docker-slim-sensor

0 commit comments

Comments
 (0)