Update s2i code to new dependencies
@@ -15,7 +15,7 @@ import (
"strings"
"github.com/docker/distribution/reference"
- "github.com/docker/docker/cliconfig"
+ cliconfig "github.com/docker/docker/cli/config"
"github.com/docker/engine-api/client"
"github.com/openshift/source-to-image/pkg/api"
s2ierr "github.com/openshift/source-to-image/pkg/errors"
@@ -394,7 +394,7 @@ func GetDefaultDockerConfig() *api.DockerConfig {
certPath := os.Getenv("DOCKER_CERT_PATH")
if certPath == "" {
- certPath = cliconfig.ConfigDir()
+ certPath = cliconfig.Dir()
}
cfg.CertFile = filepath.Join(certPath, "cert.pem")
