github-mirror/ctop
1
0
Fork 0
mirror of https://github.com/bcicen/ctop.git synced 2025-12-06 15:16:41 +08:00
Code Issues Projects Releases 1 Wiki Activity

Update runc to 1.1.0 to get newer x/sys and fix Go 1.18 build (#292)

Browse Source 
* Update runc to 1.1.0 to get newer x/sys

...to fix building on Darwin with Go 1.18.

This required some code changes as opencontainers unfortunately introduced breaking changes in a minor revision.
However, those changes were to simpify the libcontainer factory initialization.

* Switch CircleCI image to cimg/go, update remote Docker version to 20.10
This commit is contained in:
DasSkelett
2022-03-23 18:46:40 +01:00
committed by GitHub
parent acbf17a4fd
commit 163060b3fa
8 changed files with 37 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
connector/collector/mock.go
View File

@@ -1,3 +1,4 @@
//go:build !release
// +build !release
package collector

1
connector/collector/proc.go
View File

@@ -1,3 +1,4 @@
//go:build linux
// +build linux
package collector

1
connector/collector/runc.go
View File

@@ -1,3 +1,4 @@
//go:build linux
// +build linux
package collector

1
connector/mock.go
View File

@@ -1,3 +1,4 @@
//go:build !release
// +build !release
package connector

22
connector/runc.go
View File

@@ -1,9 +1,10 @@
//go:build linux
// +build linux
package connector
import (
"fmt"
"errors"
"io/ioutil"
"os"
"path/filepath"
@@ -14,7 +15,6 @@ import (
"github.com/bcicen/ctop/connector/manager"
"github.com/bcicen/ctop/container"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/cgroups/systemd"
)
func init() { enabled["runc"] = NewRunc }
@@ -65,7 +65,7 @@ func NewRunc() (Connector, error) {
return nil, err
}
factory, err := getFactory(opts)
factory, err := libcontainer.New(opts.root)
if err != nil {
return nil, err
}
@@ -104,7 +104,7 @@ func (cm *Runc) GetLibc(id string) libcontainer.Container {
libc, err := cm.factory.Load(id)
if err != nil {
// remove container if no longer exists
if lerr, ok := err.(libcontainer.Error); ok && lerr.Code() == libcontainer.ContainerNotExists {
if errors.Is(err, libcontainer.ErrNotExist) {
cm.delByID(id)
} else {
log.Warningf("failed to read container: %s\n", err)
@@ -169,7 +169,7 @@ func (cm *Runc) refreshAll() {
}
// queue all existing containers for refresh
for id, _ := range cm.containers {
for id := range cm.containers {
cm.needsRefresh <- id
}
log.Debugf("queued %d containers for refresh", len(cm.containers))
@@ -243,15 +243,3 @@ func (cm *Runc) All() (containers container.Containers) {
cm.lock.Unlock()
return containers
}
func getFactory(opts RuncOpts) (libcontainer.Factory, error) {
cgroupManager := libcontainer.Cgroupfs
if opts.systemdCgroups {
if systemd.IsRunningSystemd() {
cgroupManager = libcontainer.SystemdCgroups
} else {
return nil, fmt.Errorf("systemd cgroup enabled, but systemd support for managing cgroups is not available")
}
}
return libcontainer.New(opts.root, cgroupManager)
}