Merge pull request #35823 from thaJeztah/remove-dead-code

Remove dead code and redundant build tags

cmd/dockerd/config_experimental.go

@@ -1,9 +0,0 @@
-package main
-
-import (
-	"github.com/docker/docker/daemon/config"
-	"github.com/spf13/pflag"
-)
-
-func attachExperimentalFlags(conf *config.Config, cmd *pflag.FlagSet) {
-}

cmd/dockerd/config_solaris.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"github.com/docker/docker/daemon/config"
-	"github.com/spf13/pflag"
-)
-
-// installConfigFlags adds flags to the pflag.FlagSet to configure the daemon
-func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) {
-	// First handle install flags which are consistent cross-platform
-	installCommonConfigFlags(conf, flags)
-
-	// Then install flags common to unix platforms
-	installUnixConfigFlags(conf, flags)
-
-	attachExperimentalFlags(conf, flags)
-}

cmd/dockerd/config_unix.go

@@ -44,6 +44,4 @@ func installConfigFlags(conf *config.Config, flags *pflag.FlagSet) {
 	flags.Var(&conf.ShmSize, "default-shm-size", "Default shm size for containers")
 	flags.BoolVar(&conf.NoNewPrivileges, "no-new-privileges", false, "Set no-new-privileges by default for new containers")
 	flags.StringVar(&conf.IpcMode, "default-ipc-mode", config.DefaultIpcMode, `Default mode for containers ipc ("shareable" | "private")`)
-
-	attachExperimentalFlags(conf, flags)
 }

cmd/dockerd/daemon_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import systemdDaemon "github.com/coreos/go-systemd/daemon"

container/container_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package container
 
 import (

container/state_solaris.go

@@ -1,7 +0,0 @@
-package container
-
-// setFromExitStatus is a platform specific helper function to set the state
-// based on the ExitStatus structure.
-func (s *State) setFromExitStatus(exitStatus *ExitStatus) {
-	s.ExitCodeValue = exitStatus.ExitCode
-}

daemon/archive_tarcopyoptions_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package daemon
 
 import (

daemon/cluster/listen_addr_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package cluster
 
 import (

daemon/cluster/listen_addr_solaris.go

@@ -1,57 +0,0 @@
-package cluster
-
-import (
-	"bufio"
-	"fmt"
-	"net"
-	"os/exec"
-	"strings"
-)
-
-func (c *Cluster) resolveSystemAddr() (net.IP, error) {
-	defRouteCmd := "/usr/sbin/ipadm show-addr -p -o addr " +
-		"`/usr/sbin/route get default | /usr/bin/grep interface | " +
-		"/usr/bin/awk '{print $2}'`"
-	out, err := exec.Command("/usr/bin/bash", "-c", defRouteCmd).Output()
-	if err != nil {
-		return nil, fmt.Errorf("cannot get default route: %v", err)
-	}
-
-	defInterface := strings.SplitN(string(out), "/", 2)
-	defInterfaceIP := net.ParseIP(defInterface[0])
-
-	return defInterfaceIP, nil
-}
-
-func listSystemIPs() []net.IP {
-	var systemAddrs []net.IP
-	cmd := exec.Command("/usr/sbin/ipadm", "show-addr", "-p", "-o", "addr")
-	cmdReader, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil
-	}
-
-	if err := cmd.Start(); err != nil {
-		return nil
-	}
-
-	scanner := bufio.NewScanner(cmdReader)
-	go func() {
-		for scanner.Scan() {
-			text := scanner.Text()
-			nameAddrPair := strings.SplitN(text, "/", 2)
-			// Let go of loopback interfaces and docker interfaces
-			systemAddrs = append(systemAddrs, net.ParseIP(nameAddrPair[0]))
-		}
-	}()
-
-	if err := scanner.Err(); err != nil {
-		fmt.Printf("scan underwent err: %+v\n", err)
-	}
-
-	if err := cmd.Wait(); err != nil {
-		fmt.Printf("run command wait: %+v\n", err)
-	}
-
-	return systemAddrs
-}

daemon/config/config_solaris.go

@@ -1,30 +0,0 @@
-package config
-
-// Config defines the configuration of a docker daemon.
-// These are the configuration settings that you pass
-// to the docker daemon when you launch it with say: `docker -d -e lxc`
-type Config struct {
-	CommonConfig
-
-	// These fields are common to all unix platforms.
-	CommonUnixConfig
-}
-
-// BridgeConfig stores all the bridge driver specific
-// configuration.
-type BridgeConfig struct {
-	commonBridgeConfig
-
-	// Fields below here are platform specific.
-	commonUnixBridgeConfig
-}
-
-// IsSwarmCompatible defines if swarm mode can be enabled in this config
-func (conf *Config) IsSwarmCompatible() error {
-	return nil
-}
-
-// ValidatePlatformConfig checks if any platform-specific configuration settings are invalid.
-func (conf *Config) ValidatePlatformConfig() error {
-	return nil
-}

daemon/configs_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package daemon
 
 func configsSupported() bool {

daemon/configs_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package daemon
 
 func configsSupported() bool {

daemon/container_windows.go

@@ -1,5 +1,3 @@
-//+build windows
-
 package daemon
 
 import (

daemon/daemon_experimental.go

@@ -1,7 +0,0 @@
-package daemon
-
-import "github.com/docker/docker/api/types/container"
-
-func (daemon *Daemon) verifyExperimentalContainerSettings(hostConfig *container.HostConfig, config *container.Config) ([]string, error) {
-	return nil, nil
-}

daemon/daemon_unix.go

@@ -574,11 +574,6 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
 	var warnings []string
 	sysInfo := sysinfo.New(true)
 
-	warnings, err := daemon.verifyExperimentalContainerSettings(hostConfig, config)
-	if err != nil {
-		return warnings, err
-	}
-
 	w, err := verifyContainerResources(&hostConfig.Resources, sysInfo, update)
 
 	// no matter err is nil or not, w could have data in itself.

daemon/exec_solaris.go

@@ -1,11 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/exec"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func (daemon *Daemon) execSetPlatformOpt(_ *container.Container, _ *exec.Config, _ *specs.Process) error {
-	return nil
-}

daemon/graphdriver/driver_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package graphdriver
 
 import (

daemon/graphdriver/vfs/copy_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package vfs
 
 import "github.com/docker/docker/daemon/graphdriver/copy"

daemon/graphdriver/vfs/quota_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package vfs
 
 import "github.com/docker/docker/daemon/graphdriver/quota"

daemon/initlayer/setup_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package initlayer
 
 import (

daemon/inspect_linux.go

@@ -1,5 +1,3 @@
-// +build !windows
-
 package daemon
 
 import (

daemon/inspect_solaris.go

@@ -1,27 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/versions/v1p19"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/exec"
-)
-
-// This sets platform-specific fields
-func setPlatformSpecificContainerFields(container *container.Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase {
-	return contJSONBase
-}
-
-// containerInspectPre120 get containers for pre 1.20 APIs.
-func (daemon *Daemon) containerInspectPre120(name string) (*v1p19.ContainerJSON, error) {
-	return &v1p19.ContainerJSON{}, nil
-}
-
-func inspectExecProcessConfig(e *exec.Config) *backend.ExecProcessConfig {
-	return &backend.ExecProcessConfig{
-		Tty:        e.Tty,
-		Entrypoint: e.Entrypoint,
-		Arguments:  e.Args,
-	}
-}

daemon/listeners/listeners_linux.go

@@ -1,5 +1,3 @@
-// +build !windows
-
 package listeners
 
 import (

daemon/listeners/listeners_solaris.go

@@ -1,43 +0,0 @@
-package listeners
-
-import (
-	"crypto/tls"
-	"fmt"
-	"net"
-	"os"
-
-	"github.com/docker/go-connections/sockets"
-	"github.com/sirupsen/logrus"
-)
-
-// Init creates new listeners for the server.
-func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) (ls []net.Listener, err error) {
-	switch proto {
-	case "tcp":
-		l, err := sockets.NewTCPSocket(addr, tlsConfig)
-		if err != nil {
-			return nil, err
-		}
-		ls = append(ls, l)
-	case "unix":
-		gid, err := lookupGID(socketGroup)
-		if err != nil {
-			if socketGroup != "" {
-				if socketGroup != defaultSocketGroup {
-					return nil, err
-				}
-				logrus.Warnf("could not change group %s to %s: %v", addr, defaultSocketGroup, err)
-			}
-			gid = os.Getgid()
-		}
-		l, err := sockets.NewUnixSocket(addr, gid)
-		if err != nil {
-			return nil, fmt.Errorf("can't create unix socket %s: %v", addr, err)
-		}
-		ls = append(ls, l)
-	default:
-		return nil, fmt.Errorf("Invalid protocol format: %q", proto)
-	}
-
-	return
-}

daemon/logger/gcplogs/gcplogging_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package gcplogs
 
 import (

daemon/monitor_solaris.go

@@ -1,11 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/libcontainerd"
-)
-
-// postRunProcessing perfoms any processing needed on the container after it has stopped.
-func (daemon *Daemon) postRunProcessing(_ *container.Container, _ libcontainerd.EventInfo) error {
-	return nil
-}

daemon/secrets_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package daemon
 
 func secretsSupported() bool {

daemon/secrets_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package daemon
 
 func secretsSupported() bool {

daemon/selinux_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package daemon
 
 import "github.com/opencontainers/selinux/go-selinux"

daemon/stats/collector_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package stats
 
 // platformNewStatsCollector performs platform specific initialisation of the

daemon/update_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package daemon
 
 import (

daemon/update_solaris.go

@@ -1,11 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/libcontainerd"
-)
-
-func toContainerdResources(resources container.Resources) libcontainerd.Resources {
-	var r libcontainerd.Resources
-	return r
-}

daemon/update_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package daemon
 
 import (

daemon/volumes_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package daemon
 
 import (

distribution/pull_v2_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package distribution
 
 import (

opts/hosts_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package opts
 
 // DefaultHost constant defines the default host string used by docker on Windows

pkg/archive/archive_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package archive
 
 import (

pkg/directory/directory_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package directory
 
 import (

pkg/dmesg/dmesg_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package dmesg
 
 import (

pkg/fsutils/fsutils_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package fsutils
 
 import (

pkg/homedir/homedir_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package homedir
 
 import (

pkg/idtools/idtools_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package idtools
 
 import (

pkg/ioutils/temp_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package ioutils
 
 import (

pkg/mount/mountinfo_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package mount
 
 import (

pkg/mount/sharedsubtree_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package mount
 
 // MakeShared ensures a mounted filesystem has the SHARED mount option enabled.

pkg/parsers/kernel/kernel_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package kernel
 
 import (

pkg/reexec/command_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package reexec
 
 import (

pkg/reexec/command_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package reexec
 
 import (

pkg/signal/signal_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package signal
 
 import (

pkg/sysinfo/numcpu_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package sysinfo
 
 import (

pkg/sysinfo/numcpu_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package sysinfo
 
 import (

pkg/sysinfo/sysinfo_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package sysinfo
 
 // New returns an empty SysInfo for windows for now.

pkg/system/chtimes_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package system
 
 import (

pkg/system/filesys_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package system
 
 import (

pkg/system/mknod_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package system
 
 // Mknod is not implemented on Windows.

pkg/system/umask_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package system
 
 // Umask is not supported on the windows platform.

pkg/term/term_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package term
 
 import (

plugin/backend_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package plugin
 
 import (

plugin/manager_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package plugin
 
 import (

plugin/manager_solaris.go

@@ -1,30 +0,0 @@
-package plugin
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/plugin/v2"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error {
-	return fmt.Errorf("Not implemented")
-}
-
-func (pm *Manager) initSpec(p *v2.Plugin) (*specs.Spec, error) {
-	return nil, fmt.Errorf("Not implemented")
-}
-
-func (pm *Manager) disable(p *v2.Plugin, c *controller) error {
-	return fmt.Errorf("Not implemented")
-}
-
-func (pm *Manager) restore(p *v2.Plugin) error {
-	return fmt.Errorf("Not implemented")
-}
-
-// Shutdown plugins
-func (pm *Manager) Shutdown() {
-}
-
-func setupRoot(root string) error { return nil }

plugin/manager_windows.go

@@ -1,5 +1,3 @@
-// +build windows
-
 package plugin
 
 import (

plugin/v2/plugin_linux.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package v2
 
 import (