Skip to content

Commit

Permalink
Merge pull request #1990 from priyawadhwa/revert-docker
Browse files Browse the repository at this point in the history
 Remove docker plugin and revert to original code structure
  • Loading branch information
dgageot authored Apr 20, 2019
2 parents db8c18a + c605b63 commit 37baddd
Show file tree
Hide file tree
Showing 51 changed files with 214 additions and 2,041 deletions.
8 changes: 0 additions & 8 deletions cmd/skaffold/app/skaffold.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,9 @@ import (
"io"

"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/build/plugin"
)

func Run(out, stderr io.Writer) error {
corePlugin, err := plugin.GetCorePluginFromEnv()
if err != nil {
return err
}
if corePlugin != "" {
return plugin.Execute(corePlugin)
}
c := cmd.NewSkaffoldCommand(out, stderr)
return c.Execute()
}
13 changes: 0 additions & 13 deletions integration/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,6 @@ func TestRun(t *testing.T) {
// dir: "examples/helm-deployment",
// deployments: []string{"skaffold-helm"},
// remoteOnly: true,
}, {
description: "docker plugin in gcb exec environment",
dir: "testdata/plugin/gcb",
deployments: []string{"leeroy-app", "leeroy-web"},
remoteOnly: true,
}, {
description: "bazel plugin in local exec environment",
dir: "testdata/plugin/local/bazel",
pods: []string{"bazel"},
}, {
description: "docker plugin in local exec environment",
dir: "testdata/plugin/local/docker",
deployments: []string{"leeroy-app", "leeroy-web"},
}, {
description: "jib in googlecloudbuild",
dir: "testdata/jib",
Expand Down
9 changes: 0 additions & 9 deletions integration/testdata/plugin/gcb/leeroy-app/Dockerfile

This file was deleted.

17 changes: 0 additions & 17 deletions integration/testdata/plugin/gcb/leeroy-app/app.go

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions integration/testdata/plugin/gcb/leeroy-web/Dockerfile

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions integration/testdata/plugin/gcb/leeroy-web/web.go

This file was deleted.

21 changes: 0 additions & 21 deletions integration/testdata/plugin/gcb/skaffold.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions integration/testdata/plugin/local/bazel/BUILD

This file was deleted.

30 changes: 0 additions & 30 deletions integration/testdata/plugin/local/bazel/WORKSPACE

This file was deleted.

8 changes: 0 additions & 8 deletions integration/testdata/plugin/local/bazel/k8s/k8s-pod.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions integration/testdata/plugin/local/bazel/main.go

This file was deleted.

10 changes: 0 additions & 10 deletions integration/testdata/plugin/local/bazel/skaffold.yaml

This file was deleted.

This file was deleted.

17 changes: 0 additions & 17 deletions integration/testdata/plugin/local/docker/leeroy-app/app.go

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 37baddd

Please sign in to comment.