diff --git a/.travis.yml b/.travis.yml index 8505a0fc1..808a6f383 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ os: linux go: - 1.9.x -go_import_path: github.com/GoogleCloudPlatform/kaniko +go_import_path: github.com/GoogleContainerTools/kaniko script: - make test diff --git a/Gopkg.lock b/Gopkg.lock index 32b6f13b4..f10ecacc3 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -22,15 +22,20 @@ version = "v0.3.0" [[projects]] - branch = "master" name = "github.com/GoogleCloudPlatform/container-diff" + packages = ["cmd/util/output"] + revision = "9eb30146e04ed241c8d5be4e0b9383efaa60a395" + version = "v0.9.0" + +[[projects]] + branch = "master" + name = "github.com/GoogleContainerTools/container-diff" packages = [ - "cmd/util/output", "pkg/image", "pkg/util" ] revision = "859166bbd7810e3c3fc072f1c33ad57b9f4acbd0" - source = "github.com/GoogleCloudPlatform/container-diff" + source = "github.com/GoogleContainerTools/container-diff" [[projects]] name = "github.com/Microsoft/go-winio" @@ -639,6 +644,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "73e91b49fe7ddd3b2189053fca5e81f748ace00c33c3c66dc63a68dd0c067dca" + inputs-digest = "6d64e71de2909767e347f36c90936a5f77da94f74fe2dbf84d6d44fdbcdf4fba" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index b7a3da9c9..47af20cd9 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -19,9 +19,9 @@ source = "github.com/docker/distribution" [[constraint]] - name = "github.com/GoogleCloudPlatform/container-diff" + name = "github.com/GoogleContainerTools/container-diff" branch = "master" - source = "github.com/GoogleCloudPlatform/container-diff" + source = "github.com/GoogleContainerTools/container-diff" [[constraint]] name = "github.com/docker/docker" diff --git a/Makefile b/Makefile index 8fd23fbab..06b8c78c5 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ VERSION_PACKAGE = $(REPOPATH/pkg/version) GOOS ?= $(shell go env GOOS) GOARCH = amd64 -ORG := github.com/GoogleCloudPlatform +ORG := github.com/GoogleContainerTools PROJECT := kaniko REGISTRY?=gcr.io/kaniko-project diff --git a/README.md b/README.md index 0d58c4013..0cb439381 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ To create `context.tar.gz`, run the following command: tar -C -zcvf context.tar.gz . ``` -Or, you can use [skaffold](https://github.com/GoogleCloudPlatform/skaffold) to create `context.tar.gz` by running +Or, you can use [skaffold](https://github.com/GoogleContainerTools/skaffold) to create `context.tar.gz` by running ``` skaffold docker context ``` @@ -129,7 +129,7 @@ Similar tools include: * [img](https://github.com/genuinetools/img) * [orca-build](https://github.com/cyphar/orca-build) * [buildah](https://github.com/projectatomic/buildah) -* [FTL](https://github.com/GoogleCloudPlatform/runtimes-common/tree/master/ftl) +* [FTL](https://github.com/GoogleContainerTools/runtimes-common/tree/master/ftl) * [Bazel rules_docker](https://github.com/bazelbuild/rules_docker) All of these tools build container images with different approaches. diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go index 825b893bc..7a648fb1d 100644 --- a/cmd/executor/cmd/root.go +++ b/cmd/executor/cmd/root.go @@ -23,10 +23,10 @@ import ( "github.com/genuinetools/amicontained/container" - "github.com/GoogleCloudPlatform/kaniko/pkg/executor" + "github.com/GoogleContainerTools/kaniko/pkg/executor" - "github.com/GoogleCloudPlatform/kaniko/pkg/constants" - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + "github.com/GoogleContainerTools/kaniko/pkg/constants" + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/executor/main.go b/cmd/executor/main.go index d7e69ff30..8fb6ae731 100644 --- a/cmd/executor/main.go +++ b/cmd/executor/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/GoogleCloudPlatform/kaniko/cmd/executor/cmd" + "github.com/GoogleContainerTools/kaniko/cmd/executor/cmd" ) func main() { diff --git a/deploy/executor-release.yaml b/deploy/executor-release.yaml index e6de9e5cf..c733962ba 100644 --- a/deploy/executor-release.yaml +++ b/deploy/executor-release.yaml @@ -6,7 +6,7 @@ steps: - name: "make" path: "/usr/bin" - name: "gcr.io/google-appengine/debian9" - args: ["sh", "-c", "cp -r . /kaniko/ && mkdir -p /workspace/go/src/github.com/GoogleCloudPlatform/ && cp -r /kaniko/ /workspace/go/src/github.com/GoogleCloudPlatform/"] + args: ["sh", "-c", "cp -r . /kaniko/ && mkdir -p /workspace/go/src/github.com/GoogleContainerTools/ && cp -r /kaniko/ /workspace/go/src/github.com/GoogleContainerTools/"] volumes: - name: "make" path: "/usr/bin" @@ -16,10 +16,10 @@ steps: volumes: - name: "make" path: "/usr/bin" - dir: go/src/github.com/GoogleCloudPlatform/kaniko + dir: go/src/github.com/GoogleContainerTools/kaniko env: ["GOPATH=/workspace/go/"] # Then, build kaniko with kaniko - name: "gcr.io/kaniko-project/executor:latest" args: ["--dockerfile=/workspace/deploy/Dockerfile", - "--context=/workspace/go/src/github.com/GoogleCloudPlatform/kaniko/", + "--context=/workspace/go/src/github.com/GoogleContainerTools/kaniko/", "--destination=gcr.io/kaniko-project/executor:${COMMIT_SHA}"] diff --git a/hack/dep.sh b/hack/dep.sh index e9f4b723e..36850cf56 100755 --- a/hack/dep.sh +++ b/hack/dep.sh @@ -31,7 +31,7 @@ install_dep() { } if [ -z "$VALIDATE_UPSTREAM" ]; then - VALIDATE_REPO='git@github.com:GoogleCloudPlatform/kaniko.git' + VALIDATE_REPO='git@github.com:GoogleContainerTools/kaniko.git' VALIDATE_BRANCH='master' VALIDATE_HEAD="$(git rev-parse --verify HEAD)" diff --git a/integration-test.sh b/integration-test.sh index 2763b0ccd..2ef8d07a6 100755 --- a/integration-test.sh +++ b/integration-test.sh @@ -18,9 +18,9 @@ set -ex if [ -f "$KOKORO_GFILE_DIR"/common.sh ]; then echo "Installing dependencies..." source "$KOKORO_GFILE_DIR/common.sh" - mkdir -p /usr/local/go/src/github.com/GoogleCloudPlatform/ - cp -r github/kaniko /usr/local/go/src/github.com/GoogleCloudPlatform/ - pushd /usr/local/go/src/github.com/GoogleCloudPlatform/kaniko + mkdir -p /usr/local/go/src/github.com/GoogleContainerTools/ + cp -r github/kaniko /usr/local/go/src/github.com/GoogleContainerTools/ + pushd /usr/local/go/src/github.com/GoogleContainerTools/kaniko fi echo "Running integration tests..." diff --git a/pkg/commands/add.go b/pkg/commands/add.go index 1f417da48..f6aee688c 100644 --- a/pkg/commands/add.go +++ b/pkg/commands/add.go @@ -17,12 +17,13 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + "path/filepath" + "strings" + + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" "github.com/sirupsen/logrus" - "path/filepath" - "strings" ) type AddCommand struct { diff --git a/pkg/commands/cmd_test.go b/pkg/commands/cmd_test.go index 7cac2754b..9a0c82e8a 100644 --- a/pkg/commands/cmd_test.go +++ b/pkg/commands/cmd_test.go @@ -16,11 +16,12 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" + "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" "github.com/containers/image/manifest" "github.com/containers/image/pkg/strslice" "github.com/docker/docker/builder/dockerfile/instructions" - "testing" ) var cmdTests = []struct { diff --git a/pkg/commands/copy.go b/pkg/commands/copy.go index d9cc5fc2a..845e7dfcd 100644 --- a/pkg/commands/copy.go +++ b/pkg/commands/copy.go @@ -17,13 +17,14 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/pkg/util" - "github.com/containers/image/manifest" - "github.com/docker/docker/builder/dockerfile/instructions" - "github.com/sirupsen/logrus" "os" "path/filepath" "strings" + + "github.com/GoogleContainerTools/kaniko/pkg/util" + "github.com/containers/image/manifest" + "github.com/docker/docker/builder/dockerfile/instructions" + "github.com/sirupsen/logrus" ) type CopyCommand struct { diff --git a/pkg/commands/entrypoint_test.go b/pkg/commands/entrypoint_test.go index a718260f5..ae24e8fea 100644 --- a/pkg/commands/entrypoint_test.go +++ b/pkg/commands/entrypoint_test.go @@ -16,11 +16,12 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" + "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" "github.com/containers/image/manifest" "github.com/containers/image/pkg/strslice" "github.com/docker/docker/builder/dockerfile/instructions" - "testing" ) var entrypointTests = []struct { diff --git a/pkg/commands/env.go b/pkg/commands/env.go index ecab6f1d9..acb379e23 100644 --- a/pkg/commands/env.go +++ b/pkg/commands/env.go @@ -19,7 +19,7 @@ package commands import ( "strings" - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" "github.com/sirupsen/logrus" diff --git a/pkg/commands/env_test.go b/pkg/commands/env_test.go index b7abe4732..346d57e43 100644 --- a/pkg/commands/env_test.go +++ b/pkg/commands/env_test.go @@ -16,10 +16,11 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" + "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" - "testing" ) func TestUpdateEnvConfig(t *testing.T) { diff --git a/pkg/commands/expose.go b/pkg/commands/expose.go index 2caecb44c..2dca6a5a5 100644 --- a/pkg/commands/expose.go +++ b/pkg/commands/expose.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" "github.com/sirupsen/logrus" diff --git a/pkg/commands/expose_test.go b/pkg/commands/expose_test.go index 7a196c442..8bf8184f9 100644 --- a/pkg/commands/expose_test.go +++ b/pkg/commands/expose_test.go @@ -17,10 +17,11 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" + "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" - "testing" ) func TestUpdateExposedPorts(t *testing.T) { diff --git a/pkg/commands/label.go b/pkg/commands/label.go index 93978d0c0..60577403a 100644 --- a/pkg/commands/label.go +++ b/pkg/commands/label.go @@ -17,11 +17,12 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + "strings" + + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" "github.com/sirupsen/logrus" - "strings" ) type LabelCommand struct { diff --git a/pkg/commands/label_test.go b/pkg/commands/label_test.go index 13f36b80e..fd91cc570 100644 --- a/pkg/commands/label_test.go +++ b/pkg/commands/label_test.go @@ -17,10 +17,11 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" + "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" - "testing" ) func TestUpdateLabels(t *testing.T) { diff --git a/pkg/commands/onbuild.go b/pkg/commands/onbuild.go index 630b119d4..d0e1167de 100644 --- a/pkg/commands/onbuild.go +++ b/pkg/commands/onbuild.go @@ -17,7 +17,7 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" "github.com/sirupsen/logrus" diff --git a/pkg/commands/onbuild_test.go b/pkg/commands/onbuild_test.go index cdb6d7a48..a67450960 100644 --- a/pkg/commands/onbuild_test.go +++ b/pkg/commands/onbuild_test.go @@ -17,10 +17,11 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" + "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" - "testing" ) var onbuildTests = []struct { diff --git a/pkg/commands/user.go b/pkg/commands/user.go index bff51c3b5..5ca5687dc 100644 --- a/pkg/commands/user.go +++ b/pkg/commands/user.go @@ -17,12 +17,13 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + "os/user" + "strings" + + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" "github.com/sirupsen/logrus" - "os/user" - "strings" ) type UserCommand struct { diff --git a/pkg/commands/user_test.go b/pkg/commands/user_test.go index 6758e1ca8..27f19ba54 100644 --- a/pkg/commands/user_test.go +++ b/pkg/commands/user_test.go @@ -16,10 +16,11 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" + "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" - "testing" ) var userTests = []struct { diff --git a/pkg/commands/volume.go b/pkg/commands/volume.go index 762044b77..31fb476a9 100644 --- a/pkg/commands/volume.go +++ b/pkg/commands/volume.go @@ -17,12 +17,13 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + "os" + "strings" + + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" "github.com/sirupsen/logrus" - "os" - "strings" ) type VolumeCommand struct { diff --git a/pkg/commands/volume_test.go b/pkg/commands/volume_test.go index f909d565f..07b6b1d75 100644 --- a/pkg/commands/volume_test.go +++ b/pkg/commands/volume_test.go @@ -16,10 +16,11 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" + "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" - "testing" ) func TestUpdateVolume(t *testing.T) { diff --git a/pkg/commands/workdir.go b/pkg/commands/workdir.go index 9575abdac..8972efecb 100644 --- a/pkg/commands/workdir.go +++ b/pkg/commands/workdir.go @@ -17,12 +17,13 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + "os" + "path/filepath" + + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" "github.com/sirupsen/logrus" - "os" - "path/filepath" ) type WorkdirCommand struct { diff --git a/pkg/commands/workdir_test.go b/pkg/commands/workdir_test.go index faf525ca0..67187c2ae 100644 --- a/pkg/commands/workdir_test.go +++ b/pkg/commands/workdir_test.go @@ -16,10 +16,11 @@ limitations under the License. package commands import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" + "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" - "testing" ) // Each test here changes the same WorkingDir field in the config diff --git a/pkg/executor/executor.go b/pkg/executor/executor.go index 42de6c7f5..58871466e 100644 --- a/pkg/executor/executor.go +++ b/pkg/executor/executor.go @@ -21,12 +21,12 @@ import ( "io/ioutil" "os" - "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/GoogleContainerTools/kaniko/pkg/commands" + "github.com/GoogleContainerTools/kaniko/pkg/constants" + "github.com/GoogleContainerTools/kaniko/pkg/dockerfile" + "github.com/GoogleContainerTools/kaniko/pkg/image" + "github.com/GoogleContainerTools/kaniko/pkg/snapshot" + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/containers/image/manifest" "github.com/docker/docker/builder/dockerfile/instructions" "github.com/sirupsen/logrus" diff --git a/pkg/image/image.go b/pkg/image/image.go index 73a4bf7c0..52035ef69 100644 --- a/pkg/image/image.go +++ b/pkg/image/image.go @@ -20,11 +20,11 @@ import ( "fmt" "os" - "github.com/GoogleCloudPlatform/kaniko/pkg/version" + "github.com/GoogleContainerTools/kaniko/pkg/version" "github.com/containers/image/types" - img "github.com/GoogleCloudPlatform/container-diff/pkg/image" - "github.com/GoogleCloudPlatform/kaniko/pkg/constants" + img "github.com/GoogleContainerTools/container-diff/pkg/image" + "github.com/GoogleContainerTools/kaniko/pkg/constants" "github.com/containers/image/copy" "github.com/containers/image/docker" "github.com/containers/image/signature" diff --git a/pkg/snapshot/snapshot.go b/pkg/snapshot/snapshot.go index 965f6b68b..1966537fb 100644 --- a/pkg/snapshot/snapshot.go +++ b/pkg/snapshot/snapshot.go @@ -19,7 +19,8 @@ package snapshot import ( "archive/tar" "bytes" - "github.com/GoogleCloudPlatform/kaniko/pkg/util" + + "github.com/GoogleContainerTools/kaniko/pkg/util" "github.com/sirupsen/logrus" "io" diff --git a/pkg/snapshot/snapshot_test.go b/pkg/snapshot/snapshot_test.go index c3f66110f..2def85db0 100644 --- a/pkg/snapshot/snapshot_test.go +++ b/pkg/snapshot/snapshot_test.go @@ -18,14 +18,15 @@ package snapshot import ( "archive/tar" "bytes" - "github.com/GoogleCloudPlatform/kaniko/pkg/util" - "github.com/GoogleCloudPlatform/kaniko/testutil" - "github.com/pkg/errors" "io" "io/ioutil" "os" "path/filepath" "testing" + + "github.com/GoogleContainerTools/kaniko/pkg/util" + "github.com/GoogleContainerTools/kaniko/testutil" + "github.com/pkg/errors" ) func TestSnapshotFileChange(t *testing.T) { diff --git a/pkg/util/bucket_util.go b/pkg/util/bucket_util.go index 5ccea6da9..8113ebdd9 100644 --- a/pkg/util/bucket_util.go +++ b/pkg/util/bucket_util.go @@ -17,12 +17,13 @@ limitations under the License. package util import ( - "cloud.google.com/go/storage" - "github.com/GoogleCloudPlatform/kaniko/pkg/constants" - "github.com/sirupsen/logrus" - "golang.org/x/net/context" "os" "path/filepath" + + "cloud.google.com/go/storage" + "github.com/GoogleContainerTools/kaniko/pkg/constants" + "github.com/sirupsen/logrus" + "golang.org/x/net/context" ) // UnpackTarFromGCSBucket unpacks the context.tar.gz file in the given bucket to the given directory diff --git a/pkg/util/command_util_test.go b/pkg/util/command_util_test.go index 9650036a4..242a1a305 100644 --- a/pkg/util/command_util_test.go +++ b/pkg/util/command_util_test.go @@ -17,12 +17,13 @@ limitations under the License. package util import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" "sort" "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" ) -var testUrl = "https://github.com/GoogleCloudPlatform/runtimes-common/blob/master/LICENSE" +var testUrl = "https://github.com/GoogleContainerTools/runtimes-common/blob/master/LICENSE" var testEnvReplacement = []struct { path string diff --git a/pkg/util/fs_util.go b/pkg/util/fs_util.go index 5fb06f6ee..e2d5f588f 100644 --- a/pkg/util/fs_util.go +++ b/pkg/util/fs_util.go @@ -18,16 +18,17 @@ package util import ( "bufio" - pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util" - "github.com/GoogleCloudPlatform/kaniko/pkg/constants" - "github.com/containers/image/docker" - "github.com/sirupsen/logrus" "io" "net/http" "os" "path/filepath" "strings" "time" + + pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util" + "github.com/GoogleContainerTools/kaniko/pkg/constants" + "github.com/containers/image/docker" + "github.com/sirupsen/logrus" ) var whitelist = []string{"/kaniko"} diff --git a/pkg/util/fs_util_test.go b/pkg/util/fs_util_test.go index 39666c3cc..36583564c 100644 --- a/pkg/util/fs_util_test.go +++ b/pkg/util/fs_util_test.go @@ -17,12 +17,13 @@ limitations under the License. package util import ( - "github.com/GoogleCloudPlatform/kaniko/testutil" "io/ioutil" "os" "path/filepath" "sort" "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" ) func Test_fileSystemWhitelist(t *testing.T) { diff --git a/pkg/util/tar_util.go b/pkg/util/tar_util.go index 32df63261..707ce6c29 100644 --- a/pkg/util/tar_util.go +++ b/pkg/util/tar_util.go @@ -20,14 +20,15 @@ import ( "archive/tar" "compress/bzip2" "compress/gzip" - pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util" - "github.com/docker/docker/pkg/archive" - "github.com/pkg/errors" - "github.com/sirupsen/logrus" "io" "io/ioutil" "os" "syscall" + + pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util" + "github.com/docker/docker/pkg/archive" + "github.com/pkg/errors" + "github.com/sirupsen/logrus" ) var hardlinks = make(map[uint64]string) diff --git a/pkg/util/tar_util_test.go b/pkg/util/tar_util_test.go index 356fb4c1c..053eaf7ae 100644 --- a/pkg/util/tar_util_test.go +++ b/pkg/util/tar_util_test.go @@ -19,12 +19,13 @@ package util import ( "archive/tar" "compress/gzip" - "github.com/GoogleCloudPlatform/kaniko/testutil" "io" "io/ioutil" "os" "path/filepath" "testing" + + "github.com/GoogleContainerTools/kaniko/testutil" ) var regularFiles = []string{"file", "file.tar", "file.tar.gz"} diff --git a/vendor/github.com/GoogleContainerTools/container-diff/LICENSE b/vendor/github.com/GoogleContainerTools/container-diff/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/vendor/github.com/GoogleContainerTools/container-diff/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/image/mutable_source.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/image/mutable_source.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/image/mutable_source.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/image/mutable_source.go diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/image/proxy_types.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/image/proxy_types.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/image/proxy_types.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/image/proxy_types.go diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/cloud_prepper.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/util/cloud_prepper.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/cloud_prepper.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/util/cloud_prepper.go diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/daemon_prepper.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/util/daemon_prepper.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/daemon_prepper.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/util/daemon_prepper.go diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/docker_utils.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/util/docker_utils.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/docker_utils.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/util/docker_utils.go diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/fs_utils.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/util/fs_utils.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/fs_utils.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/util/fs_utils.go diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/image_prep_utils.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/util/image_prep_utils.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/image_prep_utils.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/util/image_prep_utils.go diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/image_utils.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/util/image_utils.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/image_utils.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/util/image_utils.go diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/tar_prepper.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/util/tar_prepper.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/tar_prepper.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/util/tar_prepper.go diff --git a/vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/tar_utils.go b/vendor/github.com/GoogleContainerTools/container-diff/pkg/util/tar_utils.go similarity index 100% rename from vendor/github.com/GoogleCloudPlatform/container-diff/pkg/util/tar_utils.go rename to vendor/github.com/GoogleContainerTools/container-diff/pkg/util/tar_utils.go