Skip to content

Commit

Permalink
libswarm
Browse files Browse the repository at this point in the history
Signed-off-by: Andrea Luzzardi <[email protected]>
  • Loading branch information
aluzzardi committed Jun 7, 2016
1 parent 4bce453 commit bb791f1
Show file tree
Hide file tree
Showing 179 changed files with 464 additions and 464 deletions.
2 changes: 1 addition & 1 deletion Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Swarm: Cluster orchestration for Docker

[![GoDoc](https://godoc.org/github.com/docker/swarm-v2?status.png)](https://godoc.org/github.com/docker/swarm-v2)
[![Circle CI](https://circleci.com/gh/docker/swarm-v2.svg?style=shield&circle-token=a7bf494e28963703a59de71cf19b73ad546058a7)](https://circleci.com/gh/docker/swarm-v2)
[![codecov.io](https://codecov.io/github/docker/swarm-v2/coverage.svg?branch=master&token=LqD1dzTjsN)](https://codecov.io/github/docker/swarm-v2?branch=master)
[![GoDoc](https://godoc.org/github.com/docker/libswarm?status.png)](https://godoc.org/github.com/docker/libswarm)
[![Circle CI](https://circleci.com/gh/docker/libswarm.svg?style=shield&circle-token=a7bf494e28963703a59de71cf19b73ad546058a7)](https://circleci.com/gh/docker/libswarm)
[![codecov.io](https://codecov.io/github/docker/libswarm/coverage.svg?branch=master&token=LqD1dzTjsN)](https://codecov.io/github/docker/libswarm?branch=master)

## Build

Expand All @@ -19,7 +19,7 @@ make binaries
Because this project's code continues to evolve rapidly, you should rebuild from master regularly. Any git tutorial can help you, but in general terms you will:

```sh
$ cd $GOPATH/src/github.com/docker/swarm-v2
$ cd $GOPATH/src/github.com/docker/libswarm
$ git checkout master
$ git pull origin master
$ make binaries
Expand Down
8 changes: 4 additions & 4 deletions agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"time"

"github.com/Sirupsen/logrus"
"github.com/docker/swarm-v2/agent/exec"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/log"
"github.com/docker/swarm-v2/protobuf/ptypes"
"github.com/docker/libswarm/agent/exec"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/log"
"github.com/docker/libswarm/protobuf/ptypes"
"golang.org/x/net/context"
)

Expand Down
10 changes: 5 additions & 5 deletions agent/agent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"testing"
"time"

"github.com/docker/swarm-v2/agent/exec"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/ca"
"github.com/docker/swarm-v2/ca/testutils"
"github.com/docker/swarm-v2/picker"
"github.com/docker/libswarm/agent/exec"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/ca"
"github.com/docker/libswarm/ca/testutils"
"github.com/docker/libswarm/picker"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
"google.golang.org/grpc"
Expand Down
6 changes: 3 additions & 3 deletions agent/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package agent
import (
"fmt"

"github.com/docker/swarm-v2/agent/exec"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/picker"
"github.com/docker/libswarm/agent/exec"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/picker"
"google.golang.org/grpc"
)

Expand Down
4 changes: 2 additions & 2 deletions agent/exec/container/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
engineapi "github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/events"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/log"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/log"
"golang.org/x/net/context"
)

Expand Down
6 changes: 3 additions & 3 deletions agent/exec/container/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/docker/engine-api/types/events"
"github.com/docker/engine-api/types/filters"
"github.com/docker/engine-api/types/network"
"github.com/docker/swarm-v2/agent/exec"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/spec"
"github.com/docker/libswarm/agent/exec"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/spec"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions agent/exec/container/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
engineapi "github.com/docker/engine-api/client"
"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/events"
"github.com/docker/swarm-v2/agent/exec"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/log"
"github.com/docker/libswarm/agent/exec"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/log"
"golang.org/x/net/context"
)

Expand Down
4 changes: 2 additions & 2 deletions agent/exec/container/controller_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"

engineapi "github.com/docker/engine-api/client"
"github.com/docker/swarm-v2/agent/exec"
"github.com/docker/swarm-v2/api"
"github.com/docker/libswarm/agent/exec"
"github.com/docker/libswarm/api"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
)
Expand Down
10 changes: 5 additions & 5 deletions agent/exec/container/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (

"github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/events"
"github.com/docker/swarm-v2/agent/exec"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/identity"
"github.com/docker/swarm-v2/log"
"github.com/docker/swarm-v2/protobuf/ptypes"
"github.com/docker/libswarm/agent/exec"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/identity"
"github.com/docker/libswarm/log"
"github.com/docker/libswarm/protobuf/ptypes"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
Expand Down
4 changes: 2 additions & 2 deletions agent/exec/container/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"strings"

engineapi "github.com/docker/engine-api/client"
"github.com/docker/swarm-v2/agent/exec"
"github.com/docker/swarm-v2/api"
"github.com/docker/libswarm/agent/exec"
"github.com/docker/libswarm/api"
"golang.org/x/net/context"
)

Expand Down
4 changes: 2 additions & 2 deletions agent/exec/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"

"github.com/Sirupsen/logrus"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/log"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/log"
"golang.org/x/net/context"
)

Expand Down
4 changes: 2 additions & 2 deletions agent/exec/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"runtime"
"testing"

"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/log"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/log"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
Expand Down
2 changes: 1 addition & 1 deletion agent/exec/controller_test.mock.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package exec

import (
api "github.com/docker/swarm-v2/api"
api "github.com/docker/libswarm/api"
gomock "github.com/golang/mock/gomock"
context "golang.org/x/net/context"
)
Expand Down
2 changes: 1 addition & 1 deletion agent/exec/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"fmt"

"github.com/docker/swarm-v2/api"
"github.com/docker/libswarm/api"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion agent/exec/executor.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package exec

import (
"github.com/docker/swarm-v2/api"
"github.com/docker/libswarm/api"
"golang.org/x/net/context"
)

Expand Down
12 changes: 6 additions & 6 deletions agent/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"time"

"github.com/Sirupsen/logrus"
"github.com/docker/swarm-v2/agent/exec"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/ca"
"github.com/docker/swarm-v2/ioutils"
"github.com/docker/swarm-v2/manager"
"github.com/docker/swarm-v2/picker"
"github.com/docker/libswarm/agent/exec"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/ca"
"github.com/docker/libswarm/ioutils"
"github.com/docker/libswarm/manager"
"github.com/docker/libswarm/picker"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
6 changes: 3 additions & 3 deletions agent/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"time"

"github.com/Sirupsen/logrus"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/log"
"github.com/docker/swarm-v2/protobuf/ptypes"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/log"
"github.com/docker/libswarm/protobuf/ptypes"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down
4 changes: 2 additions & 2 deletions api/ca.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/control.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions api/dispatcher.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/duration/gen.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
//go:generate protoc -I.:../../vendor:../../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+raftproxy+authenticatedwrapper,import_path=github.com/docker/swarm-v2/api/duration,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. duration.proto
//go:generate protoc -I.:../../vendor:../../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+raftproxy+authenticatedwrapper,import_path=github.com/docker/libswarm/api/duration,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. duration.proto

package duration
2 changes: 1 addition & 1 deletion api/gen.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package api

//go:generate protoc -I.:../protobuf:../vendor:../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+raftproxy+authenticatedwrapper,import_path=github.com/docker/swarm-v2/api,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mtimestamp/timestamp.proto=github.com/docker/swarm-v2/api/timestamp,Mduration/duration.proto=github.com/docker/swarm-v2/api/duration,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mplugin/plugin.proto=github.com/docker/swarm-v2/protobuf/plugin:. types.proto specs.proto objects.proto control.proto dispatcher.proto ca.proto snapshot.proto raft.proto
//go:generate protoc -I.:../protobuf:../vendor:../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+raftproxy+authenticatedwrapper,import_path=github.com/docker/libswarm/api,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mtimestamp/timestamp.proto=github.com/docker/libswarm/api/timestamp,Mduration/duration.proto=github.com/docker/libswarm/api/duration,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mplugin/plugin.proto=github.com/docker/libswarm/protobuf/plugin:. types.proto specs.proto objects.proto control.proto dispatcher.proto ca.proto snapshot.proto raft.proto
2 changes: 1 addition & 1 deletion api/objects.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/raft.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/specs.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/timestamp/gen.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
//go:generate protoc -I.:../../vendor:../../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+raftproxy+authenticatedwrapper,import_path=github.com/docker/swarm-v2/api/timestamp,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. timestamp.proto
//go:generate protoc -I.:../../vendor:../../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+raftproxy+authenticatedwrapper,import_path=github.com/docker/libswarm/api/timestamp,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. timestamp.proto

package timestamp
4 changes: 2 additions & 2 deletions api/types.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ca/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/Sirupsen/logrus"

"github.com/docker/swarm-v2/log"
"github.com/docker/libswarm/log"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down
8 changes: 4 additions & 4 deletions ca/certificates.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
cfsigner "github.com/cloudflare/cfssl/signer"
"github.com/cloudflare/cfssl/signer/local"
"github.com/docker/go-events"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/identity"
"github.com/docker/swarm-v2/ioutils"
"github.com/docker/swarm-v2/picker"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/identity"
"github.com/docker/libswarm/ioutils"
"github.com/docker/libswarm/picker"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
10 changes: 5 additions & 5 deletions ca/certificates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (

cfcsr "github.com/cloudflare/cfssl/csr"
"github.com/cloudflare/cfssl/helpers"
"github.com/docker/swarm-v2/api"
"github.com/docker/swarm-v2/ca"
"github.com/docker/swarm-v2/ca/testutils"
"github.com/docker/swarm-v2/manager/state"
"github.com/docker/swarm-v2/manager/state/store"
"github.com/docker/libswarm/api"
"github.com/docker/libswarm/ca"
"github.com/docker/libswarm/ca/testutils"
"github.com/docker/libswarm/manager/state"
"github.com/docker/libswarm/manager/state/store"
"github.com/phayes/permbits"
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
Expand Down
Loading

0 comments on commit bb791f1

Please sign in to comment.