diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-24 16:52:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 16:52:02 +0200 |
| commit | 72260a296c534950d9c899ee907e73b5dd0162f0 (patch) | |
| tree | d9b33042a70c2d1e600c75855a29b3aa594aaab6 /vendor/github.com/fsouza/go-dockerclient/tls.go | |
| parent | cf244d87cdb9b2cb0d8510b2ea392d928c1eb269 (diff) | |
| parent | d697456dc90adbaf68224ed7c115b38d5855e582 (diff) | |
| download | podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.gz podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.bz2 podman-72260a296c534950d9c899ee907e73b5dd0162f0.zip | |
Merge pull request #3414 from vrothberg/go-modules
Go modules
Diffstat (limited to 'vendor/github.com/fsouza/go-dockerclient/tls.go')
| -rw-r--r-- | vendor/github.com/fsouza/go-dockerclient/tls.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/fsouza/go-dockerclient/tls.go b/vendor/github.com/fsouza/go-dockerclient/tls.go index 5f0e2e31e..07661f3d1 100644 --- a/vendor/github.com/fsouza/go-dockerclient/tls.go +++ b/vendor/github.com/fsouza/go-dockerclient/tls.go @@ -38,7 +38,7 @@ func tlsDialWithDialer(dialer *net.Dialer, network, addr string, config *tls.Con timeout := dialer.Timeout if !dialer.Deadline.IsZero() { - deadlineTimeout := dialer.Deadline.Sub(time.Now()) + deadlineTimeout := time.Until(dialer.Deadline) if timeout == 0 || deadlineTimeout < timeout { timeout = deadlineTimeout } |