mirror of https://github.com/portainer/portainer
fix(updater): specify docker client version [EE-5010] (#8459)
parent
e2168d21c7
commit
51b9804fab
|
@ -59,6 +59,19 @@ func createLocalClient(endpoint *portainer.Endpoint) (*client.Client, error) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func CreateClientFromEnv() (*client.Client, error) {
|
||||||
|
return client.NewClientWithOpts(
|
||||||
|
client.FromEnv,
|
||||||
|
client.WithVersion(dockerClientVersion),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func CreateSimpleClient() (*client.Client, error) {
|
||||||
|
return client.NewClientWithOpts(
|
||||||
|
client.WithVersion(dockerClientVersion),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
func createTCPClient(endpoint *portainer.Endpoint, timeout *time.Duration) (*client.Client, error) {
|
func createTCPClient(endpoint *portainer.Endpoint, timeout *time.Duration) (*client.Client, error) {
|
||||||
httpCli, err := httpClient(endpoint, timeout)
|
httpCli, err := httpClient(endpoint, timeout)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -11,10 +11,10 @@ import (
|
||||||
"github.com/cbroglie/mustache"
|
"github.com/cbroglie/mustache"
|
||||||
"github.com/docker/docker/api/types"
|
"github.com/docker/docker/api/types"
|
||||||
"github.com/docker/docker/api/types/filters"
|
"github.com/docker/docker/api/types/filters"
|
||||||
"github.com/docker/docker/client"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
libstack "github.com/portainer/docker-compose-wrapper"
|
libstack "github.com/portainer/docker-compose-wrapper"
|
||||||
portainer "github.com/portainer/portainer/api"
|
portainer "github.com/portainer/portainer/api"
|
||||||
|
"github.com/portainer/portainer/api/docker"
|
||||||
"github.com/portainer/portainer/api/filesystem"
|
"github.com/portainer/portainer/api/filesystem"
|
||||||
"github.com/portainer/portainer/api/platform"
|
"github.com/portainer/portainer/api/platform"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
|
@ -150,7 +150,7 @@ func (service *service) upgradeDocker(licenseKey, version, envType string) error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (service *service) checkImage(ctx context.Context, image string, skipPullImage bool) error {
|
func (service *service) checkImage(ctx context.Context, image string, skipPullImage bool) error {
|
||||||
cli, err := client.NewClientWithOpts(client.FromEnv)
|
cli, err := docker.CreateClientFromEnv()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.Wrap(err, "failed to create docker client")
|
return errors.Wrap(err, "failed to create docker client")
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ import (
|
||||||
|
|
||||||
"github.com/docker/docker/client"
|
"github.com/docker/docker/client"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
|
"github.com/portainer/portainer/api/docker"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -53,7 +54,7 @@ func DetermineContainerPlatform() (ContainerPlatform, error) {
|
||||||
return "", nil
|
return "", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
dockerCli, err := client.NewClientWithOpts()
|
dockerCli, err := docker.CreateSimpleClient()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", errors.WithMessage(err, "failed to create docker client")
|
return "", errors.WithMessage(err, "failed to create docker client")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue