Skip to content

Rename github.com/docker/swarmkit/agent/exec/container => .../dockerapi #1969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aaronlehmann merged 1 commit into from
Feb 22, 2017
Merged

Rename github.com/docker/swarmkit/agent/exec/container => .../dockerapi #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/exec/container/adapter.go → agent/exec/dockerapi/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package container
package dockerapi

import (
"encoding/json"
Expand Down
2 changes: 1 addition & 1 deletion agent/exec/container/api_client_test.mock.go → agent/exec/dockerapi/api_client_test.mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Automatically generated by MockGen. DO NOT EDIT!
// Source: github.com/docker/docker/client (interfaces: APIClient)

package container
package dockerapi

import (
types "github.com/docker/docker/api/types"
Expand Down
2 changes: 1 addition & 1 deletion agent/exec/container/container.go → agent/exec/dockerapi/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package container
package dockerapi

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion agent/exec/container/container_test.go → agent/exec/dockerapi/container_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package container
package dockerapi

import (
"reflect"
Expand Down
2 changes: 1 addition & 1 deletion agent/exec/container/controller.go → agent/exec/dockerapi/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package container
package dockerapi

import (
"bufio"
Expand Down
2 changes: 1 addition & 1 deletion .../container/controller_integration_test.go → .../dockerapi/controller_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package container
package dockerapi

import (
"flag"
Expand Down
4 changes: 2 additions & 2 deletions agent/exec/container/controller_test.go → agent/exec/dockerapi/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package container
package dockerapi

import (
"bytes"
Expand Down Expand Up @@ -28,7 +28,7 @@ var tenSecond = 10 * time.Second
// UPDATE(stevvooe): Gomock is still broken garbage. Sigh. This time, had to
// generate, then manually "unvendor" imports. Further cements the
// realization that mocks are a garbage way to build tests.
//+go:generate mockgen -package container -destination api_client_test.mock.go github.com/docker/docker/client APIClient
//+go:generate mockgen -package dockerapi -destination api_client_test.mock.go github.com/docker/docker/client APIClient

func TestControllerPrepare(t *testing.T) {
task := genTask(t)
Expand Down
2 changes: 1 addition & 1 deletion agent/exec/container/errors.go → agent/exec/dockerapi/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package container
package dockerapi

import "errors"

Expand Down
2 changes: 1 addition & 1 deletion agent/exec/container/executor.go → agent/exec/dockerapi/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package container
package dockerapi

import (
"sort"
Expand Down
4 changes: 2 additions & 2 deletions cmd/swarmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/Sirupsen/logrus"
engineapi "github.com/docker/docker/client"
"github.com/docker/swarmkit/agent/exec/container"
"github.com/docker/swarmkit/agent/exec/dockerapi"
"github.com/docker/swarmkit/cli"
"github.com/docker/swarmkit/log"
"github.com/docker/swarmkit/manager/encryption"
Expand Down Expand Up @@ -151,7 +151,7 @@ var (
return err
}

executor := container.NewExecutor(client)
executor := dockerapi.NewExecutor(client)

if debugAddr != "" {
go func() {
Expand Down