mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

runtimes/docker: use getDockerClient function everywhere so all functions can work via e.g. ssh

Browse Source
This commit is contained in:
iwilltry42 2021-06-04 07:43:06 +02:00
parent a2b3e9ddcf
commit 34aac579d2
No known key found for this signature in database
GPG Key ID: 7BA57AD1CFF16110
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/runtimes/docker/container.go
View File

@ -74,7 +74,7 @@ func createContainer(ctx context.Context, dockerNode *NodeInDocker, name string)
func startContainer(ctx context.Context, ID string) error {
// initialize docker client
docker, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
docker, err := GetDockerClient()
if err != nil {
log.Errorln("Failed to create docker client")
return err
@ -184,7 +184,7 @@ func getNodeContainer(ctx context.Context, node *k3d.Node) (*types.Container, er
// executes an arbitrary command in a container while returning its exit code.
// useful to check something in docker env
func executeCheckInContainer(ctx context.Context, image string, cmd []string) (int64, error) {
docker, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
docker, err := GetDockerClient()
if err != nil {
log.Errorln("Failed to create docker client")
return -1, err

5
pkg/runtimes/docker/network.go
View File

@ -30,7 +30,6 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"inet.af/netaddr"
runtimeErr "github.com/rancher/k3d/v4/pkg/runtimes/errors"
@ -275,7 +274,7 @@ func (d Docker) ConnectNodeToNetwork(ctx context.Context, node *k3d.Node, networ
}
// get docker client
docker, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
docker, err := GetDockerClient()
if err != nil {
log.Errorln("Failed to create docker client")
return err
@ -303,7 +302,7 @@ func (d Docker) DisconnectNodeFromNetwork(ctx context.Context, node *k3d.Node, n
}
// get docker client
docker, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
docker, err := GetDockerClient()
if err != nil {
log.Errorln("Failed to create docker client")
return err

5
pkg/runtimes/docker/node.go
View File

@ -33,7 +33,6 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/client"
runtimeErr "github.com/rancher/k3d/v4/pkg/runtimes/errors"
k3d "github.com/rancher/k3d/v4/pkg/types"
log "github.com/sirupsen/logrus"
@ -251,7 +250,7 @@ func (d Docker) GetNodeStatus(ctx context.Context, node *k3d.Node) (bool, string
}
// create docker client
docker, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
docker, err := GetDockerClient()
if err != nil {
log.Errorln("Failed to create docker client")
return running, stateString, err
@ -415,7 +414,7 @@ func executeInNode(ctx context.Context, node *k3d.Node, cmd []string) (*types.Hi
// GetNodesInNetwork returns all the nodes connected to a given network
func (d Docker) GetNodesInNetwork(ctx context.Context, network string) ([]*k3d.Node, error) {
// create docker client
docker, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
docker, err := GetDockerClient()
if err != nil {
log.Errorln("Failed to create docker client")
return nil, err

2
pkg/runtimes/docker/util.go
View File

@ -106,7 +106,7 @@ func (d Docker) WriteToNode(ctx context.Context, content []byte, dest string, mo
}
// create docker client
docker, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
docker, err := GetDockerClient()
if err != nil {
log.Errorln("Failed to create docker client")
return err