Merge pull request #7531 from greut/docker-v19.03.8

Docker v19.03.8

drivers/docker/driver_default.go

@@ -3,7 +3,7 @@
 package docker
 
 import (
-	"github.com/docker/docker/daemon/caps"
+	"github.com/docker/docker/oci/caps"
 	docker "github.com/fsouza/go-dockerclient"
 )
 
@@ -19,7 +19,7 @@ func tweakCapabilities(basics, adds, drops []string) ([]string, error) {
 		basics[i] = "CAP_" + cap
 	}
 
-	effectiveCaps, err := caps.TweakCapabilities(basics, adds, drops)
+	effectiveCaps, err := caps.TweakCapabilities(basics, adds, drops, nil, false)
 	if err != nil {
 		return effectiveCaps, err
 	}

drivers/docker/utils.go

@@ -11,7 +11,9 @@ import (
 	"strings"
 
 	"github.com/docker/cli/cli/config/configfile"
+	"github.com/docker/cli/cli/config/types"
 	"github.com/docker/distribution/reference"
+	registrytypes "github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/registry"
 	docker "github.com/fsouza/go-dockerclient"
 )
@@ -117,7 +119,7 @@ func authFromDockerConfig(file string) authBackend {
 
 		return firstValidAuth(repo, []authBackend{
 			func(string) (*docker.AuthConfiguration, error) {
-				dockerAuthConfig := registry.ResolveAuthConfig(cfile.AuthConfigs, repoInfo.Index)
+				dockerAuthConfig := registryResolveAuthConfig(cfile.AuthConfigs, repoInfo.Index)
 				auth := &docker.AuthConfiguration{
 					Username:      dockerAuthConfig.Username,
 					Password:      dockerAuthConfig.Password,
@@ -280,3 +282,25 @@ func parseVolumeSpecLinux(volBind string) (hostPath string, containerPath string
 
 	return parts[0], parts[1], m, nil
 }
+
+// ResolveAuthConfig matches an auth configuration to a server address or a URL
+// copied from https://github.com/moby/moby/blob/ca20bc4214e6a13a5f134fb0d2f67c38065283a8/registry/auth.go#L217-L235
+// but with the CLI types.AuthConfig type rather than api/types
+func registryResolveAuthConfig(authConfigs map[string]types.AuthConfig, index *registrytypes.IndexInfo) types.AuthConfig {
+	configKey := registry.GetAuthConfigKey(index)
+	// First try the happy case
+	if c, found := authConfigs[configKey]; found || index.Official {
+		return c
+	}
+
+	// Maybe they have a legacy config file, we will iterate the keys converting
+	// them to the new format and testing
+	for r, ac := range authConfigs {
+		if configKey == registry.ConvertToHostname(r) {
+			return ac
+		}
+	}
+
+	// When all else fails, return an empty auth config
+	return types.AuthConfig{}
+}