diff options
| author | Chanwit Kaewkasi <chanwit@gmail.com> | 2018-05-10 16:56:49 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-05-10 16:57:41 -0700 |
| commit | 7b6111b695840ab2938abe0d207514dd34081327 (patch) | |
| tree | 90961933623d12675a0a17136e19089d1a4fb892 | |
| parent | ac01f245ff4515af2b69225e8b7fb2cf28808275 (diff) | |
Display the current git revision in the info block
Change-Id: I9737cc680968033ba82c95bb04cc482fcaa12642
PiperOrigin-RevId: 196192683
| -rw-r--r-- | runsc/BUILD | 1 | ||||
| -rw-r--r-- | runsc/main.go | 3 | ||||
| -rw-r--r-- | tools/bazel.rc | 1 | ||||
| -rwxr-xr-x | tools/workspace_status.sh | 17 |
4 files changed, 22 insertions, 0 deletions
diff --git a/runsc/BUILD b/runsc/BUILD index 3651c2d30..8f8e2ee35 100644 --- a/runsc/BUILD +++ b/runsc/BUILD @@ -8,6 +8,7 @@ go_binary( "main.go", ], pure = "on", + x_defs = {"main.gitRevision": "{GIT_REVISION}"}, deps = [ "//pkg/log", "//runsc/boot", diff --git a/runsc/main.go b/runsc/main.go index 883b8b1f4..3311514d2 100644 --- a/runsc/main.go +++ b/runsc/main.go @@ -61,6 +61,8 @@ var ( overlay = flag.Bool("overlay", false, "wrap filesystem mounts with writable overlay. All modifications are stored in memory inside the sandbox.") ) +var gitRevision = "" + func main() { // Help and flags commands are generated automatically. subcommands.Register(subcommands.HelpCommand(), "") @@ -166,6 +168,7 @@ func main() { log.Infof("***************************") log.Infof("Args: %s", os.Args) + log.Infof("Git Revision: %s", gitRevision) log.Infof("PID: %d", os.Getpid()) log.Infof("UID: %d, GID: %d", os.Getuid(), os.Getgid()) log.Infof("Configuration:") diff --git a/tools/bazel.rc b/tools/bazel.rc new file mode 100644 index 000000000..6e437306c --- /dev/null +++ b/tools/bazel.rc @@ -0,0 +1 @@ +build --workspace_status_command tools/workspace_status.sh diff --git a/tools/workspace_status.sh b/tools/workspace_status.sh new file mode 100755 index 000000000..d89db1f99 --- /dev/null +++ b/tools/workspace_status.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Copyright 2018 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +echo GIT_REVISION $(git describe --always --abbrev=40 --dirty) |