Skip to content

Commit 45818d6

Browse files
committed
Removed engine-api leftovers
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent fd1037b commit 45818d6

File tree

8 files changed

+10
-237
lines changed

8 files changed

+10
-237
lines changed

ROADMAP.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ containers, and not as easily dismissed).
6363
## 1.3 Internal decoupling
6464

6565
A lot of work has been done in trying to decouple the Docker Engine's internals. In particular, the
66-
API implementation has been refactored and ongoing work is happening to move the code to a separate
67-
repository ([`docker/engine-api`](https://github.com/docker/engine-api)), and the Builder side of
68-
the daemon is now [fully independent](https://github.com/docker/docker/tree/master/builder) while
69-
still residing in the same repository.
66+
API implementation has been refactored, and the Builder side of the daemon is now
67+
[fully independent](https://github.com/docker/docker/tree/master/builder) while still residing in
68+
the same repository.
7069

7170
We are exploring ways to go further with that decoupling, capitalizing on the work introduced by the
7271
runtime renovation and plugins improvement efforts. Indeed, the combination of `containerd` support

api/types/backend/backend.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
// Package backend includes types to send information to server backends.
2-
// TODO(calavera): This package is pending of extraction to engine-api
3-
// when the server package is clean of daemon dependencies.
42
package backend
53

64
import (

api/types/swarm/service.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ type ServiceSpec struct {
2121
Mode ServiceMode `json:",omitempty"`
2222
UpdateConfig *UpdateConfig `json:",omitempty"`
2323

24-
// Networks field in ServiceSpec is being deprecated. Users of
25-
// engine-api should start using the same field in
26-
// TaskSpec. This field will be removed in future releases.
24+
// Networks field in ServiceSpec is deprecated. The
25+
// same field in TaskSpec should be used instead.
26+
// This field will be removed in a future release.
2727
Networks []NetworkAttachmentConfig `json:",omitempty"`
2828
EndpointSpec *EndpointSpec `json:",omitempty"`
2929
}

daemon/stats_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (daemon *Daemon) getNetworkStats(c *container.Container) (map[string]types.
4040
}
4141

4242
stats := make(map[string]types.NetworkStats)
43-
// Convert libnetwork nw stats into engine-api stats
43+
// Convert libnetwork nw stats into api stats
4444
for ifName, ifStats := range lnstats {
4545
stats[ifName] = types.NetworkStats{
4646
RxBytes: ifStats.RxBytes,

docs/reference/api/remote_api_client_libraries.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ with the library maintainers.
5050
<td>bwu_docker</td>
5151
<td><a class="reference external" href="https://github.com/bwu-dart/bwu_docker">https://github.com/bwu-dart/bwu_docker</a></td>
5252
</tr>
53-
<tr>
54-
<td>Go</td>
55-
<td>engine-api</td>
56-
<td><a class="reference external" href="https://github.com/docker/engine-api">https://github.com/docker/engine-api</a></td>
57-
</tr>
5853
<tr>
5954
<td>Gradle</td>
6055
<td>gradle-docker-plugin</td>

hack/vendor.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ set -e
55
#
66
# Usage:
77
# vendor.sh revendor all dependencies
8-
# vendor.sh github.com/docker/engine-api revendor only the engine-api dependency.
9-
# vendor.sh github.com/docker/engine-api v0.3.3 vendor only engine-api at the specified tag/commit.
10-
# vendor.sh git github.com/docker/engine-api v0.3.3 is the same but specifies the VCS for cases where the VCS is something else than git
8+
# vendor.sh github.com/docker/libkv revendor only the libkv dependency.
9+
# vendor.sh github.com/docker/libkv v0.2.1 vendor only libkv at the specified tag/commit.
10+
# vendor.sh git github.com/docker/libkv v0.2.1 is the same but specifies the VCS for cases where the VCS is something else than git
1111
# vendor.sh git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git vendor only golang.org/x/sys downloading from the specified URL
1212

1313
cd "$(dirname "$BASH_SOURCE")/.."
@@ -66,7 +66,6 @@ clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://gith
6666
clone git github.com/docker/go-units f2145db703495b2e525c59662db69a7344b00bb8
6767
clone git github.com/docker/go-connections 988efe982fdecb46f01d53465878ff1f2ff411ce
6868

69-
clone git github.com/docker/engine-api f9cef590446e4e6073b49b652f47a337b897c1a3
7069
clone git github.com/RackSec/srslog 365bf33cd9acc21ae1c355209865f17228ca534e
7170
clone git github.com/imdario/mergo 0.2.1
7271

vendor/src/github.com/docker/engine-api/LICENSE

Lines changed: 0 additions & 191 deletions
This file was deleted.

vendor/src/github.com/docker/engine-api/client/transport/cancellable/LICENSE

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)