diff --git a/Makefile b/Makefile index 7f6ecfa71..a44551147 100644 --- a/Makefile +++ b/Makefile @@ -37,18 +37,14 @@ KANIKO_PROJECT = $(REPOPATH)/kaniko out/executor: $(GO_FILES) GOARCH=$(GOARCH) GOOS=linux CGO_ENABLED=0 go build -ldflags $(GO_LDFLAGS) -tags $(GO_BUILD_TAGS) -o $@ $(EXECUTOR_PACKAGE) - -out/kaniko: $(GO_FILES) - GOOS=$* GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags $(GO_LDFLAGS) -tags $(GO_BUILD_TAGS) -o $@ $(KANIKO_PROJECT) - .PHONY: test -test: out/executor out/kaniko +test: out/executor @ ./test.sh .PHONY: integration-test -integration-test: out/executor out/kaniko +integration-test: out/executor @ ./integration-test.sh .PHONY: images -images: out/executor out/kaniko +images: out/executor docker build -t $(REGISTRY)/executor:latest -f deploy/Dockerfile . diff --git a/kaniko/cmd/root.go b/kaniko/cmd/root.go deleted file mode 100644 index dc81e1a6c..000000000 --- a/kaniko/cmd/root.go +++ /dev/null @@ -1,30 +0,0 @@ -/* -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 ( - "github.com/spf13/cobra" -) - -var RootCmd = &cobra.Command{ - Use: "kaniko", - Short: "kaniko is a CLI tool for building container images with full Dockerfile support without the need for Docker", - Long: `kaniko is a CLI tool for building container images with full Dockerfile support. It doesn't require Docker, - and builds the images in a Kubernetes cluster before pushing the final image to a registry.`, - Run: func(cmd *cobra.Command, args []string) { - }, -} diff --git a/kaniko/main.go b/kaniko/main.go deleted file mode 100644 index 81a8e08b6..000000000 --- a/kaniko/main.go +++ /dev/null @@ -1,30 +0,0 @@ -/* -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 main - -import ( - "fmt" - "github.com/GoogleCloudPlatform/kaniko/kaniko/cmd" - "os" -) - -func main() { - if err := cmd.RootCmd.Execute(); err != nil { - fmt.Println(err) - os.Exit(1) - } -}