github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move dial funcs to dialer pkg

Browse Source 
This reduces shim size from 30mb to 18mb

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-11-06 11:46:17 -05:00
parent 01cdf330bb
commit 526d15bd86
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/containerd-shim/main_unix.go
View File

@@ -13,8 +13,8 @@ import (
"syscall"
"time"
"github.com/containerd/containerd"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/dialer"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/linux/shim"
@@ -212,7 +212,7 @@ func dumpStacks(logger *logrus.Entry) {
}
func connectEvents(address string) (eventsapi.EventsClient, error) {
conn, err := connect(address, containerd.Dialer)
conn, err := connect(address, dialer.Dialer)
if err != nil {
return nil, errors.Wrapf(err, "failed to dial %q", address)
}
@@ -228,7 +228,7 @@ func connect(address string, d func(string, time.Duration) (net.Conn, error)) (*
grpc.FailOnNonTempDialError(true),
grpc.WithBackoffMaxDelay(3 * time.Second),
}
conn, err := grpc.Dial(containerd.DialAddress(address), gopts...)
conn, err := grpc.Dial(dialer.DialAddress(address), gopts...)
if err != nil {
return nil, errors.Wrapf(err, "failed to dial %q", address)
}