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

update golangci-lint

Browse Source
This commit is contained in:
iwilltry42 2019-09-26 18:15:06 +02:00
parent b51fa283e1
commit ac43655396
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -93,5 +93,5 @@ ifndef HAS_GOX
(go get $(PKG_GOX))
endif
ifndef HAS_GOLANGCI
(curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${GOPATH}/bin v1.17.1)
(curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ${GOPATH}/bin v1.19.1)
endif

2
pkg/cluster/node.go
View File

@ -39,7 +39,7 @@ func CreateNode(nodeSpec *k3d.Node, runtimeChoice string) error {
runtime = k3dContainerd.Containerd{}
}
if err := runtime.CreateNode(&k3d.Node{}); err != nil {
if err := runtime.CreateNode(nodeSpec); err != nil {
log.Error(err)
}
log.Debugln("...success")

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

@ -48,7 +48,7 @@ func (d Docker) CreateNode(nodeSpec *k3d.Node) error {
Image: "nginx",
}
resp, err := docker.ContainerCreate(ctx, &containerConfig, &container.HostConfig{}, &network.NetworkingConfig{}, "test")
resp, err := docker.ContainerCreate(ctx, &containerConfig, &container.HostConfig{}, &network.NetworkingConfig{}, nodeSpec.Name)
if err != nil {
log.Error("Couldn't create container")
return err
@ -85,6 +85,8 @@ func removeContainer(ID string) error {
return fmt.Errorf("Failed to delete container '%s'. %+v", ID, err)
}
log.Infoln("Deleted", ID)
return nil
}