mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
4f8c870d62
These showed locally when running `make validate`. CI doesn't seem to have the
same (possibly it's disabled in the configuration)
builder/fscache/fscache.go:618::error: github.com/docker/docker/vendor/github.com/tonistiigi/fsutil.StatInfo composite literal uses unkeyed fields (vet)
client/swarm_unlock_test.go:44::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
client/swarm_unlock_test.go:20::error: github.com/docker/docker/api/types/swarm.UnlockRequest composite literal uses unkeyed fields (vet)
cmd/dockerd/daemon_unix.go:113::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
cmd/dockerd/daemon_unix.go:110::error: github.com/docker/docker/cmd/dockerd/hack.MalformedHostHeaderOverride composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay/overlay.go:171::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay/overlay.go:413::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay2/overlay.go:203::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/overlay2/overlay.go:584::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/zfs/zfs.go:109::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/graphdriver/zfs/zfs.go:388::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
daemon/volumes_windows.go:27::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
integration/service/network_test.go:31::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
api/server/server.go:129:10⚠️ should not use basic type string as key in context.WithValue (golint)
integration/service/network_test.go:54::error: github.com/docker/docker/api/types/network.NetworkingConfig composite literal uses unkeyed fields (vet)
libcontainerd/client_daemon_linux.go:61::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
libcontainerd/client_daemon_linux.go:74::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
pkg/archive/archive_windows.go:76::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
plugin/manager_linux.go:56::error: github.com/docker/docker/pkg/idtools.IDPair composite literal uses unkeyed fields (vet)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
108 lines
2.7 KiB
Go
108 lines
2.7 KiB
Go
package libcontainerd // import "github.com/docker/docker/libcontainerd"
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/containerd/containerd"
|
|
"github.com/containerd/containerd/cio"
|
|
"github.com/docker/docker/pkg/idtools"
|
|
specs "github.com/opencontainers/runtime-spec/specs-go"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
func summaryFromInterface(i interface{}) (*Summary, error) {
|
|
return &Summary{}, nil
|
|
}
|
|
|
|
func (c *client) UpdateResources(ctx context.Context, containerID string, resources *Resources) error {
|
|
p, err := c.getProcess(containerID, InitProcessName)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// go doesn't like the alias in 1.8, this means this need to be
|
|
// platform specific
|
|
return p.(containerd.Task).Update(ctx, containerd.WithResources((*specs.LinuxResources)(resources)))
|
|
}
|
|
|
|
func hostIDFromMap(id uint32, mp []specs.LinuxIDMapping) int {
|
|
for _, m := range mp {
|
|
if id >= m.ContainerID && id <= m.ContainerID+m.Size-1 {
|
|
return int(m.HostID + id - m.ContainerID)
|
|
}
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func getSpecUser(ociSpec *specs.Spec) (int, int) {
|
|
var (
|
|
uid int
|
|
gid int
|
|
)
|
|
|
|
for _, ns := range ociSpec.Linux.Namespaces {
|
|
if ns.Type == specs.UserNamespace {
|
|
uid = hostIDFromMap(0, ociSpec.Linux.UIDMappings)
|
|
gid = hostIDFromMap(0, ociSpec.Linux.GIDMappings)
|
|
break
|
|
}
|
|
}
|
|
|
|
return uid, gid
|
|
}
|
|
|
|
func prepareBundleDir(bundleDir string, ociSpec *specs.Spec) (string, error) {
|
|
uid, gid := getSpecUser(ociSpec)
|
|
if uid == 0 && gid == 0 {
|
|
return bundleDir, idtools.MkdirAllAndChownNew(bundleDir, 0755, idtools.IDPair{UID: 0, GID: 0})
|
|
}
|
|
|
|
p := string(filepath.Separator)
|
|
components := strings.Split(bundleDir, string(filepath.Separator))
|
|
for _, d := range components[1:] {
|
|
p = filepath.Join(p, d)
|
|
fi, err := os.Stat(p)
|
|
if err != nil && !os.IsNotExist(err) {
|
|
return "", err
|
|
}
|
|
if os.IsNotExist(err) || fi.Mode()&1 == 0 {
|
|
p = fmt.Sprintf("%s.%d.%d", p, uid, gid)
|
|
if err := idtools.MkdirAndChown(p, 0700, idtools.IDPair{UID: uid, GID: gid}); err != nil && !os.IsExist(err) {
|
|
return "", err
|
|
}
|
|
}
|
|
}
|
|
|
|
return p, nil
|
|
}
|
|
|
|
func newFIFOSet(bundleDir, processID string, withStdin, withTerminal bool) *cio.FIFOSet {
|
|
config := cio.Config{
|
|
Terminal: withTerminal,
|
|
Stdout: filepath.Join(bundleDir, processID+"-stdout"),
|
|
}
|
|
paths := []string{config.Stdout}
|
|
|
|
if withStdin {
|
|
config.Stdin = filepath.Join(bundleDir, processID+"-stdin")
|
|
paths = append(paths, config.Stdin)
|
|
}
|
|
if !withTerminal {
|
|
config.Stderr = filepath.Join(bundleDir, processID+"-stderr")
|
|
paths = append(paths, config.Stderr)
|
|
}
|
|
closer := func() error {
|
|
for _, path := range paths {
|
|
if err := os.RemoveAll(path); err != nil {
|
|
logrus.Warnf("libcontainerd: failed to remove fifo %v: %v", path, err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
return cio.NewFIFOSet(config, closer)
|
|
}
|