Merge pull request #796 from prary/version

Kaniko version

Makefile

@@ -18,7 +18,6 @@ VERSION_MINOR ?= 12
 VERSION_BUILD ?= 0
 
 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
-VERSION_PACKAGE = $(REPOPATH/pkg/version)
 
 SHELL := /bin/bash
 GOOS ?= $(shell go env GOOS)
@@ -28,6 +27,7 @@ PROJECT := kaniko
 REGISTRY?=gcr.io/kaniko-project
 
 REPOPATH ?= $(ORG)/$(PROJECT)
+VERSION_PACKAGE = $(REPOPATH)/pkg/version
 
 GO_FILES := $(shell find . -type f -name '*.go' -not -path "./vendor/*")
 GO_LDFLAGS := '-extldflags "-static"

cmd/executor/cmd/root.go

@@ -54,20 +54,22 @@ func init() {
 var RootCmd = &cobra.Command{
 	Use: "executor",
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		if err := util.ConfigureLogging(logLevel); err != nil {
-			return err
-		}
-		if !opts.NoPush && len(opts.Destinations) == 0 {
-			return errors.New("You must provide --destination, or use --no-push")
-		}
-		if err := cacheFlagsValid(); err != nil {
-			return errors.Wrap(err, "cache flags invalid")
-		}
-		if err := resolveSourceContext(); err != nil {
-			return errors.Wrap(err, "error resolving source context")
-		}
-		if err := resolveDockerfilePath(); err != nil {
-			return errors.Wrap(err, "error resolving dockerfile path")
+		if cmd.Use == "executor" {
+			if err := util.ConfigureLogging(logLevel); err != nil {
+				return err
+			}
+			if !opts.NoPush && len(opts.Destinations) == 0 {
+				return errors.New("You must provide --destination, or use --no-push")
+			}
+			if err := cacheFlagsValid(); err != nil {
+				return errors.Wrap(err, "cache flags invalid")
+			}
+			if err := resolveSourceContext(); err != nil {
+				return errors.Wrap(err, "error resolving source context")
+			}
+			if err := resolveDockerfilePath(); err != nil {
+				return errors.Wrap(err, "error resolving dockerfile path")
+			}
 		}
 		return nil
 	},

cmd/executor/cmd/version.go

@@ -0,0 +1,36 @@
+/*
+Copyright 2018 Google LLC
+
+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.
+*/
+
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/GoogleContainerTools/kaniko/pkg/version"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	RootCmd.AddCommand(versionCmd)
+}
+
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Print the version number of kaniko",
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println("Kaniko version : ", version.Version())
+	},
+}

pkg/util/fs_util.go

@@ -359,9 +359,6 @@ func RelativeFiles(fp string, root string) ([]string, error) {
 		if CheckWhitelist(path) && !HasFilepathPrefix(path, root, false) {
 			return nil
 		}
-		if err != nil {
-			return err
-		}
 		relPath, err := filepath.Rel(root, path)
 		if err != nil {
 			return err