Skip to content

Commit e33fe8d

Browse files
aluzzardialuzzardi
committed
swarmkit.
Replaces moby#838 Signed-off-by: Andrea Luzzardi <[email protected]>
1 parent debcb7c commit e33fe8d

File tree

181 files changed

+467
-467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+467
-467
lines changed

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ A great way to contribute to the project is to send a detailed report when you
3737
encounter an issue. We always appreciate a well-written, thorough bug report,
3838
and will thank you for it!
3939

40-
Check that [our issue database](https://github.com/docker/libswarm/issues)
40+
Check that [our issue database](https://github.com/docker/swarmkit/issues)
4141
doesn't already include that problem or suggestion before submitting an issue.
4242
If you find a match, you can use the "subscribe" button to get notified on
4343
updates. Do *not* leave random "+1" or "I have this too" comments, as they
@@ -64,7 +64,7 @@ This section gives the experienced contributor some tips and guidelines.
6464

6565
Not sure if that typo is worth a pull request? Found a bug and know how to fix
6666
it? Do it! We will appreciate it. Any significant improvement should be
67-
documented as [a GitHub issue](https://github.com/docker/libswarm/issues) before
67+
documented as [a GitHub issue](https://github.com/docker/swarmkit/issues) before
6868
anybody starts working on it.
6969

7070
We are always thrilled to receive pull requests. We do our best to process them

‎Godeps/Godeps.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MAINTAINERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file describes who runs the docker/libswarm project and how.
2+
# This file describes who runs the docker/swarmkit project and how.
33
# This file is compiled into the MAINTAINERS file in docker/opensource.
44
#
55
[Org]

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Swarm: Cluster orchestration for Docker
22

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

77
## Build
88

@@ -19,7 +19,7 @@ make binaries
1919
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:
2020

2121
```sh
22-
$ cd $GOPATH/src/github.com/docker/libswarm
22+
$ cd $GOPATH/src/github.com/docker/swarmkit
2323
$ git checkout master
2424
$ git pull origin master
2525
$ make binaries

‎agent/agent.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"time"
1010

1111
"github.com/Sirupsen/logrus"
12-
"github.com/docker/libswarm/agent/exec"
13-
"github.com/docker/libswarm/api"
14-
"github.com/docker/libswarm/log"
15-
"github.com/docker/libswarm/protobuf/ptypes"
12+
"github.com/docker/swarmkit/agent/exec"
13+
"github.com/docker/swarmkit/api"
14+
"github.com/docker/swarmkit/log"
15+
"github.com/docker/swarmkit/protobuf/ptypes"
1616
"golang.org/x/net/context"
1717
)
1818

‎agent/agent_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"testing"
55
"time"
66

7-
"github.com/docker/libswarm/agent/exec"
8-
"github.com/docker/libswarm/api"
9-
"github.com/docker/libswarm/ca"
10-
"github.com/docker/libswarm/ca/testutils"
11-
"github.com/docker/libswarm/picker"
7+
"github.com/docker/swarmkit/agent/exec"
8+
"github.com/docker/swarmkit/api"
9+
"github.com/docker/swarmkit/ca"
10+
"github.com/docker/swarmkit/ca/testutils"
11+
"github.com/docker/swarmkit/picker"
1212
"github.com/stretchr/testify/assert"
1313
"golang.org/x/net/context"
1414
"google.golang.org/grpc"

‎agent/config.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package agent
33
import (
44
"fmt"
55

6-
"github.com/docker/libswarm/agent/exec"
7-
"github.com/docker/libswarm/api"
8-
"github.com/docker/libswarm/picker"
6+
"github.com/docker/swarmkit/agent/exec"
7+
"github.com/docker/swarmkit/api"
8+
"github.com/docker/swarmkit/picker"
99
"google.golang.org/grpc"
1010
)
1111

‎agent/exec/container/adapter.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
engineapi "github.com/docker/engine-api/client"
1111
"github.com/docker/engine-api/types"
1212
"github.com/docker/engine-api/types/events"
13-
"github.com/docker/libswarm/api"
14-
"github.com/docker/libswarm/log"
13+
"github.com/docker/swarmkit/api"
14+
"github.com/docker/swarmkit/log"
1515
"golang.org/x/net/context"
1616
)
1717

‎agent/exec/container/container.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"github.com/docker/engine-api/types/events"
1313
"github.com/docker/engine-api/types/filters"
1414
"github.com/docker/engine-api/types/network"
15-
"github.com/docker/libswarm/agent/exec"
16-
"github.com/docker/libswarm/api"
17-
"github.com/docker/libswarm/spec"
15+
"github.com/docker/swarmkit/agent/exec"
16+
"github.com/docker/swarmkit/api"
17+
"github.com/docker/swarmkit/spec"
1818
)
1919

2020
const (

‎agent/exec/container/controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
engineapi "github.com/docker/engine-api/client"
77
"github.com/docker/engine-api/types"
88
"github.com/docker/engine-api/types/events"
9-
"github.com/docker/libswarm/agent/exec"
10-
"github.com/docker/libswarm/api"
11-
"github.com/docker/libswarm/log"
9+
"github.com/docker/swarmkit/agent/exec"
10+
"github.com/docker/swarmkit/api"
11+
"github.com/docker/swarmkit/log"
1212
"golang.org/x/net/context"
1313
)
1414

‎agent/exec/container/controller_integration_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"testing"
66

77
engineapi "github.com/docker/engine-api/client"
8-
"github.com/docker/libswarm/agent/exec"
9-
"github.com/docker/libswarm/api"
8+
"github.com/docker/swarmkit/agent/exec"
9+
"github.com/docker/swarmkit/api"
1010
"github.com/stretchr/testify/assert"
1111
"golang.org/x/net/context"
1212
)

‎agent/exec/container/controller_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212

1313
"github.com/docker/engine-api/types"
1414
"github.com/docker/engine-api/types/events"
15-
"github.com/docker/libswarm/agent/exec"
16-
"github.com/docker/libswarm/api"
17-
"github.com/docker/libswarm/identity"
18-
"github.com/docker/libswarm/log"
19-
"github.com/docker/libswarm/protobuf/ptypes"
15+
"github.com/docker/swarmkit/agent/exec"
16+
"github.com/docker/swarmkit/api"
17+
"github.com/docker/swarmkit/identity"
18+
"github.com/docker/swarmkit/log"
19+
"github.com/docker/swarmkit/protobuf/ptypes"
2020
"github.com/golang/mock/gomock"
2121
"github.com/stretchr/testify/assert"
2222
"golang.org/x/net/context"

‎agent/exec/container/executor.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"strings"
55

66
engineapi "github.com/docker/engine-api/client"
7-
"github.com/docker/libswarm/agent/exec"
8-
"github.com/docker/libswarm/api"
7+
"github.com/docker/swarmkit/agent/exec"
8+
"github.com/docker/swarmkit/api"
99
"golang.org/x/net/context"
1010
)
1111

‎agent/exec/controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55

66
"github.com/Sirupsen/logrus"
7-
"github.com/docker/libswarm/api"
8-
"github.com/docker/libswarm/log"
7+
"github.com/docker/swarmkit/api"
8+
"github.com/docker/swarmkit/log"
99
"golang.org/x/net/context"
1010
)
1111

‎agent/exec/controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"runtime"
66
"testing"
77

8-
"github.com/docker/libswarm/api"
9-
"github.com/docker/libswarm/log"
8+
"github.com/docker/swarmkit/api"
9+
"github.com/docker/swarmkit/log"
1010
"github.com/golang/mock/gomock"
1111
"github.com/stretchr/testify/assert"
1212
"golang.org/x/net/context"

‎agent/exec/controller_test.mock.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
package exec
55

66
import (
7-
api "github.com/docker/libswarm/api"
7+
api "github.com/docker/swarmkit/api"
88
gomock "github.com/golang/mock/gomock"
99
context "golang.org/x/net/context"
1010
)

‎agent/exec/errors.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"fmt"
66

7-
"github.com/docker/libswarm/api"
7+
"github.com/docker/swarmkit/api"
88
)
99

1010
var (

‎agent/exec/executor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package exec
22

33
import (
4-
"github.com/docker/libswarm/api"
4+
"github.com/docker/swarmkit/api"
55
"golang.org/x/net/context"
66
)
77

‎agent/node.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import (
1313
"time"
1414

1515
"github.com/Sirupsen/logrus"
16-
"github.com/docker/libswarm/agent/exec"
17-
"github.com/docker/libswarm/api"
18-
"github.com/docker/libswarm/ca"
19-
"github.com/docker/libswarm/ioutils"
20-
"github.com/docker/libswarm/manager"
21-
"github.com/docker/libswarm/picker"
16+
"github.com/docker/swarmkit/agent/exec"
17+
"github.com/docker/swarmkit/api"
18+
"github.com/docker/swarmkit/ca"
19+
"github.com/docker/swarmkit/ioutils"
20+
"github.com/docker/swarmkit/manager"
21+
"github.com/docker/swarmkit/picker"
2222
"golang.org/x/net/context"
2323
"google.golang.org/grpc"
2424
"google.golang.org/grpc/credentials"

‎agent/session.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"time"
66

77
"github.com/Sirupsen/logrus"
8-
"github.com/docker/libswarm/api"
9-
"github.com/docker/libswarm/log"
10-
"github.com/docker/libswarm/protobuf/ptypes"
8+
"github.com/docker/swarmkit/api"
9+
"github.com/docker/swarmkit/log"
10+
"github.com/docker/swarmkit/protobuf/ptypes"
1111
"golang.org/x/net/context"
1212
"google.golang.org/grpc"
1313
"google.golang.org/grpc/codes"

‎api/ca.pb.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/control.pb.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/dispatcher.pb.go

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/duration/gen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
//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
1+
//go:generate protoc -I.:../../vendor:../../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+raftproxy+authenticatedwrapper,import_path=github.com/docker/swarmkit/api/duration,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. duration.proto
22

33
package duration

‎api/gen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package api
22

3-
//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
3+
//go:generate protoc -I.:../protobuf:../vendor:../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+raftproxy+authenticatedwrapper,import_path=github.com/docker/swarmkit/api,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mtimestamp/timestamp.proto=github.com/docker/swarmkit/api/timestamp,Mduration/duration.proto=github.com/docker/swarmkit/api/duration,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mplugin/plugin.proto=github.com/docker/swarmkit/protobuf/plugin:. types.proto specs.proto objects.proto control.proto dispatcher.proto ca.proto snapshot.proto raft.proto

‎api/objects.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/raft.pb.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/specs.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/timestamp/gen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
//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
1+
//go:generate protoc -I.:../../vendor:../../vendor/github.com/gogo/protobuf --gogoswarm_out=plugins=grpc+deepcopy+raftproxy+authenticatedwrapper,import_path=github.com/docker/swarmkit/api/timestamp,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto:. timestamp.proto
22

33
package timestamp

‎api/types.pb.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ca/auth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/Sirupsen/logrus"
99

10-
"github.com/docker/libswarm/log"
10+
"github.com/docker/swarmkit/log"
1111
"golang.org/x/net/context"
1212
"google.golang.org/grpc"
1313
"google.golang.org/grpc/codes"

‎ca/certificates.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
cfsigner "github.com/cloudflare/cfssl/signer"
2525
"github.com/cloudflare/cfssl/signer/local"
2626
"github.com/docker/go-events"
27-
"github.com/docker/libswarm/api"
28-
"github.com/docker/libswarm/identity"
29-
"github.com/docker/libswarm/ioutils"
30-
"github.com/docker/libswarm/picker"
27+
"github.com/docker/swarmkit/api"
28+
"github.com/docker/swarmkit/identity"
29+
"github.com/docker/swarmkit/ioutils"
30+
"github.com/docker/swarmkit/picker"
3131
"golang.org/x/net/context"
3232
"google.golang.org/grpc"
3333
"google.golang.org/grpc/credentials"

0 commit comments

Comments
 (0)