From cff201dee65b74e95d431018d0a6b7a0e9256b8e Mon Sep 17 00:00:00 2001 From: Matt Rickard Date: Tue, 17 Apr 2018 11:45:39 -0700 Subject: [PATCH] org rename from GoogleCloudPlatform to GoogleContainerTools --- README.md | 4 ++-- cmd/executor/cmd/root.go | 6 +++--- cmd/executor/main.go | 2 +- deploy/executor-release.yaml | 6 +++--- hack/dep.sh | 2 +- integration-test.sh | 6 +++--- integration_tests/dockerfiles/Dockerfile_test_add | 2 +- pkg/commands/add.go | 7 ++++--- pkg/commands/cmd_test.go | 5 +++-- pkg/commands/copy.go | 9 +++++---- pkg/commands/entrypoint_test.go | 5 +++-- pkg/commands/env.go | 2 +- pkg/commands/env_test.go | 5 +++-- pkg/commands/expose.go | 2 +- pkg/commands/expose_test.go | 5 +++-- pkg/commands/label.go | 5 +++-- pkg/commands/label_test.go | 5 +++-- pkg/commands/onbuild.go | 2 +- pkg/commands/onbuild_test.go | 5 +++-- pkg/commands/user.go | 7 ++++--- pkg/commands/user_test.go | 5 +++-- pkg/commands/volume.go | 7 ++++--- pkg/commands/volume_test.go | 5 +++-- pkg/commands/workdir.go | 7 ++++--- pkg/commands/workdir_test.go | 5 +++-- pkg/executor/executor.go | 12 ++++++------ pkg/image/image.go | 6 +++--- pkg/snapshot/snapshot.go | 3 ++- pkg/snapshot/snapshot_test.go | 7 ++++--- pkg/util/bucket_util.go | 9 +++++---- pkg/util/command_util_test.go | 5 +++-- pkg/util/fs_util.go | 9 +++++---- pkg/util/fs_util_test.go | 3 ++- pkg/util/tar_util.go | 9 +++++---- pkg/util/tar_util_test.go | 3 ++- 35 files changed, 105 insertions(+), 82 deletions(-) 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/integration_tests/dockerfiles/Dockerfile_test_add b/integration_tests/dockerfiles/Dockerfile_test_add index 6fb9d73a7..072d1ee77 100644 --- a/integration_tests/dockerfiles/Dockerfile_test_add +++ b/integration_tests/dockerfiles/Dockerfile_test_add @@ -15,4 +15,4 @@ ADD context/tars/fil* /tars/ ADD context/tars/file.tar /tars_again # Finally, test adding a remote URL, concurrently with a normal file -ADD https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v1.4.3/docker-credential-gcr_linux_386-1.4.3.tar.gz context/foo /test/all/ +ADD https://github.com/GoogleContainerTools/docker-credential-gcr/releases/download/v1.4.3/docker-credential-gcr_linux_386-1.4.3.tar.gz context/foo /test/all/ diff --git a/pkg/commands/add.go b/pkg/commands/add.go index 7338e773c..7e1400bbd 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 68b81c878..f76f143d4 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 c153bb379..9b9d50cac 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"}