Merge pull request #77 from priyawadhwa/kaniko
Update import paths from k8s-container-builder to kaniko
This commit is contained in:
		
						commit
						eb891c1ab9
					
				|  | @ -3,7 +3,7 @@ os: linux | |||
| 
 | ||||
| go: | ||||
|   - 1.9.x | ||||
| go_import_path: github.com/GoogleCloudPlatform/k8s-container-builder | ||||
| go_import_path: github.com/GoogleCloudPlatform/kaniko | ||||
| 
 | ||||
| script: | ||||
|   - make test | ||||
|  |  | |||
							
								
								
									
										2
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										2
									
								
								Makefile
								
								
								
								
							|  | @ -22,7 +22,7 @@ VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) | |||
| GOOS ?= $(shell go env GOOS) | ||||
| GOARCH = amd64 | ||||
| ORG := github.com/GoogleCloudPlatform | ||||
| PROJECT := k8s-container-builder | ||||
| PROJECT := kaniko | ||||
| REGISTRY?=gcr.io/kaniko-project | ||||
| 
 | ||||
| REPOPATH ?= $(ORG)/$(PROJECT) | ||||
|  |  | |||
|  | @ -18,12 +18,12 @@ package cmd | |||
| 
 | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/commands" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/constants" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/dockerfile" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/image" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/snapshot" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/commands" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/constants" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/dockerfile" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/image" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/snapshot" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/pkg/errors" | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ package main | |||
| 
 | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/executor/cmd" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/executor/cmd" | ||||
| 	"os" | ||||
| ) | ||||
| 
 | ||||
|  |  | |||
|  | @ -31,7 +31,7 @@ install_dep() { | |||
| } | ||||
| 
 | ||||
| if [ -z "$VALIDATE_UPSTREAM" ]; then | ||||
| 	VALIDATE_REPO='git@github.com:GoogleCloudPlatform/k8s-container-builder.git' | ||||
| 	VALIDATE_REPO='git@github.com:GoogleCloudPlatform/kaniko.git' | ||||
| 	VALIDATE_BRANCH='master' | ||||
| 
 | ||||
| 	VALIDATE_HEAD="$(git rev-parse --verify HEAD)" | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ package main | |||
| 
 | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/kaniko/cmd" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/kaniko/cmd" | ||||
| 	"os" | ||||
| ) | ||||
| 
 | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/sirupsen/logrus" | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/containers/image/pkg/strslice" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/sirupsen/logrus" | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/containers/image/pkg/strslice" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/sirupsen/logrus" | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"testing" | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ package commands | |||
| 
 | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/sirupsen/logrus" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"testing" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/sirupsen/logrus" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"testing" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/sirupsen/logrus" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"testing" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/sirupsen/logrus" | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"testing" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/sirupsen/logrus" | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"testing" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"github.com/sirupsen/logrus" | ||||
|  |  | |||
|  | @ -16,7 +16,7 @@ limitations under the License. | |||
| package commands | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/containers/image/manifest" | ||||
| 	"github.com/docker/docker/builder/dockerfile/instructions" | ||||
| 	"testing" | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ package image | |||
| 
 | ||||
| import ( | ||||
| 	img "github.com/GoogleCloudPlatform/container-diff/pkg/image" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/constants" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/constants" | ||||
| 	"github.com/containers/image/copy" | ||||
| 	"github.com/containers/image/docker" | ||||
| 	"github.com/containers/image/signature" | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ package snapshot | |||
| import ( | ||||
| 	"archive/tar" | ||||
| 	"bytes" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/sirupsen/logrus" | ||||
| 
 | ||||
| 	"io" | ||||
|  |  | |||
|  | @ -18,8 +18,8 @@ package snapshot | |||
| import ( | ||||
| 	"archive/tar" | ||||
| 	"bytes" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"github.com/pkg/errors" | ||||
| 	"io" | ||||
| 	"io/ioutil" | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ package util | |||
| 
 | ||||
| import ( | ||||
| 	"cloud.google.com/go/storage" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/constants" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/constants" | ||||
| 	"github.com/sirupsen/logrus" | ||||
| 	"golang.org/x/net/context" | ||||
| 	"os" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package util | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"sort" | ||||
| 	"testing" | ||||
| ) | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ package util | |||
| import ( | ||||
| 	"bufio" | ||||
| 	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/pkg/constants" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/pkg/constants" | ||||
| 	"github.com/containers/image/docker" | ||||
| 	"github.com/sirupsen/logrus" | ||||
| 	"io" | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ limitations under the License. | |||
| package util | ||||
| 
 | ||||
| import ( | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"io/ioutil" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ package util | |||
| import ( | ||||
| 	"archive/tar" | ||||
| 	"compress/gzip" | ||||
| 	"github.com/GoogleCloudPlatform/k8s-container-builder/testutil" | ||||
| 	"github.com/GoogleCloudPlatform/kaniko/testutil" | ||||
| 	"io" | ||||
| 	"io/ioutil" | ||||
| 	"os" | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue