org rename from GoogleCloudPlatform to GoogleContainerTools

README.md

@@ -36,7 +36,7 @@ To create `context.tar.gz`, run the following command:
 tar -C <path to build context> -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.

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"
 )

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() {

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}"]

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)"

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..."

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/

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 {

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 {

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 {

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 {

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"

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) {

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"

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) {

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 {

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) {

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"

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 {

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 {

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 {

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 {

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) {

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 {

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

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"

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"

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"

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) {

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

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

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"}

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) {

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)

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"}