From 8f1d39cea14ba5e14faa3f43f8e79f0be75ea293 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 13:33:10 +0100 Subject: [PATCH 1/2] Log before building or pushing. Previously there would be a make "entering directory" hint in the logs, but with the switch to `linuxkit pkg` that no longer occurs. Signed-off-by: Ian Campbell --- src/cmd/linuxkit/pkg_build.go | 2 ++ src/cmd/linuxkit/pkg_push.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/cmd/linuxkit/pkg_build.go b/src/cmd/linuxkit/pkg_build.go index 6c8108b06..d1d9b5445 100644 --- a/src/cmd/linuxkit/pkg_build.go +++ b/src/cmd/linuxkit/pkg_build.go @@ -27,6 +27,8 @@ func pkgBuild(args []string) { os.Exit(1) } + fmt.Printf("Building %q\n", p.Tag()) + var opts []pkglib.BuildOpt if *force { opts = append(opts, pkglib.WithBuildForce()) diff --git a/src/cmd/linuxkit/pkg_push.go b/src/cmd/linuxkit/pkg_push.go index 2dbcc17e5..e0141a1d4 100644 --- a/src/cmd/linuxkit/pkg_push.go +++ b/src/cmd/linuxkit/pkg_push.go @@ -27,6 +27,8 @@ func pkgPush(args []string) { os.Exit(1) } + fmt.Printf("Building and pushing %q\n", p.Tag()) + var opts []pkglib.BuildOpt opts = append(opts, pkglib.WithBuildPush()) if *force { From 2264bc80218e15c5a13e701d850d4b66751ecf80 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Tue, 10 Oct 2017 16:11:48 +0100 Subject: [PATCH 2/2] Correct typo in linuxkit pkg push help. Signed-off-by: Ian Campbell --- src/cmd/linuxkit/pkg_push.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/pkg_push.go b/src/cmd/linuxkit/pkg_push.go index e0141a1d4..6214d6990 100644 --- a/src/cmd/linuxkit/pkg_push.go +++ b/src/cmd/linuxkit/pkg_push.go @@ -13,7 +13,7 @@ func pkgPush(args []string) { flags := flag.NewFlagSet("pkg push", flag.ExitOnError) flags.Usage = func() { invoked := filepath.Base(os.Args[0]) - fmt.Fprintf(os.Stderr, "USAGE: %s pkg build [options] path\n\n", invoked) + fmt.Fprintf(os.Stderr, "USAGE: %s pkg push [options] path\n\n", invoked) fmt.Fprintf(os.Stderr, "'path' specifies the path to the package source directory.\n") fmt.Fprintf(os.Stderr, "\n") flags.PrintDefaults()