vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1359 from giuseppe/conmon-version

Browse source 
conmon: implement --version
This commit is contained in:
Daniel J Walsh 2018-02-23 13:28:39 -05:00 committed by GitHub
commit 74cd1ec97c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -1,3 +1,5 @@
include Makefile.inc
GO ?= go GO ?= go
EPOCH_TEST_COMMIT ?= 1cc5a27 EPOCH_TEST_COMMIT ?= 1cc5a27
PROJECT := github.com/kubernetes-incubator/cri-o PROJECT := github.com/kubernetes-incubator/cri-o
@ -20,8 +22,6 @@ OCIUMOUNTINSTALLDIR=$(PREFIX)/share/oci-umount/oci-umount.d
SELINUXOPT ?= $(shell command -v selinuxenabled >/dev/null 2>&1 && selinuxenabled && echo -Z) SELINUXOPT ?= $(shell command -v selinuxenabled >/dev/null 2>&1 && selinuxenabled && echo -Z)
PACKAGES ?= $(shell go list -tags "${BUILDTAGS}" ./... | grep -v github.com/kubernetes-incubator/cri-o/vendor) PACKAGES ?= $(shell go list -tags "${BUILDTAGS}" ./... | grep -v github.com/kubernetes-incubator/cri-o/vendor)
COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
BUILD_INFO := $(shell date +%s) BUILD_INFO := $(shell date +%s)
# If GOPATH not specified, use one in the local directory # If GOPATH not specified, use one in the local directory

2
Makefile.inc Normal file
View file

@ -0,0 +1,2 @@
COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")

7
conmon/Makefile
View file

@ -1,8 +1,13 @@
include ../Makefile.inc
src = $(wildcard *.c) src = $(wildcard *.c)
obj = $(src:.c=.o) obj = $(src:.c=.o)
override LIBS += $(shell pkg-config --libs glib-2.0) override LIBS += $(shell pkg-config --libs glib-2.0)
override CFLAGS += -std=c99 -Os -Wall -Wextra $(shell pkg-config --cflags glib-2.0)
VERSION = $(shell sed -n -e 's/^const Version = "\([^"]*\)"/\1/p' ../version/version.go)
override CFLAGS += -std=c99 -Os -Wall -Wextra $(shell pkg-config --cflags glib-2.0) -DVERSION=\"$(VERSION)\" -DGIT_COMMIT=\"$(GIT_COMMIT)\"
conmon: $(obj) conmon: $(obj)
$(CC) -o ../bin/$@ $^ $(CFLAGS) $(LIBS) $(CC) -o ../bin/$@ $^ $(CFLAGS) $(LIBS)

6
conmon/conmon.c
View file

@ -97,6 +97,7 @@ static inline void strv_cleanup(char ***strv)
#define DEFAULT_SOCKET_PATH "/var/lib/crio" #define DEFAULT_SOCKET_PATH "/var/lib/crio"
static bool opt_version = false;
static bool opt_terminal = false; static bool opt_terminal = false;
static bool opt_stdin = false; static bool opt_stdin = false;
static bool opt_leave_stdin_open = false; static bool opt_leave_stdin_open = false;
@ -135,6 +136,7 @@ static GOptionEntry opt_entries[] =
{ "timeout", 'T', 0, G_OPTION_ARG_INT, &opt_timeout, "Timeout in seconds", NULL }, { "timeout", 'T', 0, G_OPTION_ARG_INT, &opt_timeout, "Timeout in seconds", NULL },
{ "log-size-max", 0, 0, G_OPTION_ARG_INT64, &opt_log_size_max, "Maximum size of log file", NULL }, { "log-size-max", 0, 0, G_OPTION_ARG_INT64, &opt_log_size_max, "Maximum size of log file", NULL },
{ "socket-dir-path", 0, 0, G_OPTION_ARG_STRING, &opt_socket_path, "Location of container attach sockets", NULL }, { "socket-dir-path", 0, 0, G_OPTION_ARG_STRING, &opt_socket_path, "Location of container attach sockets", NULL },
{ "version", 0, 0, G_OPTION_ARG_NONE, &opt_version, "Print the version and exit", NULL },
{ NULL } { NULL }
}; };
@ -1119,6 +1121,10 @@ int main(int argc, char *argv[])
g_print("option parsing failed: %s\n", error->message); g_print("option parsing failed: %s\n", error->message);
exit(1); exit(1);
} }
if (opt_version) {
g_print("conmon version " VERSION "\ncommit: " GIT_COMMIT "\n");
exit(0);
}
if (opt_cid == NULL) if (opt_cid == NULL)
nexit("Container ID not provided. Use --cid"); nexit("Container ID not provided. Use --cid");