diff options
author | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-03-13 11:40:24 -0400 |
---|---|---|
committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-03-13 11:40:39 -0400 |
commit | 8f418f1568b2735fdeea9a84afc354e1f8cbc94c (patch) | |
tree | fc6b218409181bbe49c7c315bcba16ab160d49f4 /vendor/github.com/fsouza/go-dockerclient/tls.go | |
parent | 8b3f759800ebd6e53e0a807728ede633aa9bdb36 (diff) | |
download | podman-8f418f1568b2735fdeea9a84afc354e1f8cbc94c.tar.gz podman-8f418f1568b2735fdeea9a84afc354e1f8cbc94c.tar.bz2 podman-8f418f1568b2735fdeea9a84afc354e1f8cbc94c.zip |
Vendor docker/docker, fsouza and more #2
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Vendors in fsouza/docker-client, docker/docker and
a few more related. Of particular note, changes to the TweakCapabilities()
function from docker/docker along with the parse.IDMappingOptions() function
from Buildah. Please pay particular attention to the related changes in
the call from libpod to those functions during the review.
Passes baseline tests.
Diffstat (limited to 'vendor/github.com/fsouza/go-dockerclient/tls.go')
-rw-r--r-- | vendor/github.com/fsouza/go-dockerclient/tls.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/fsouza/go-dockerclient/tls.go b/vendor/github.com/fsouza/go-dockerclient/tls.go index bb5790b5f..5f0e2e31e 100644 --- a/vendor/github.com/fsouza/go-dockerclient/tls.go +++ b/vendor/github.com/fsouza/go-dockerclient/tls.go @@ -109,10 +109,10 @@ func copyTLSConfig(cfg *tls.Config) *tls.Config { NameToCertificate: cfg.NameToCertificate, NextProtos: cfg.NextProtos, PreferServerCipherSuites: cfg.PreferServerCipherSuites, - Rand: cfg.Rand, - RootCAs: cfg.RootCAs, - ServerName: cfg.ServerName, - SessionTicketKey: cfg.SessionTicketKey, - SessionTicketsDisabled: cfg.SessionTicketsDisabled, + Rand: cfg.Rand, + RootCAs: cfg.RootCAs, + ServerName: cfg.ServerName, + SessionTicketKey: cfg.SessionTicketKey, + SessionTicketsDisabled: cfg.SessionTicketsDisabled, } } |