mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Windows: Info no containerized check
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
parent
8dc07af52f
commit
ab97303cae
1 changed files with 9 additions and 5 deletions
|
@ -33,11 +33,15 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
|
|||
if s, err := operatingsystem.GetOperatingSystem(); err == nil {
|
||||
operatingSystem = s
|
||||
}
|
||||
if inContainer, err := operatingsystem.IsContainerized(); err != nil {
|
||||
logrus.Errorf("Could not determine if daemon is containerized: %v", err)
|
||||
operatingSystem += " (error determining if containerized)"
|
||||
} else if inContainer {
|
||||
operatingSystem += " (containerized)"
|
||||
|
||||
// Don't do containerized check on Windows
|
||||
if runtime.GOOS != "windows" {
|
||||
if inContainer, err := operatingsystem.IsContainerized(); err != nil {
|
||||
logrus.Errorf("Could not determine if daemon is containerized: %v", err)
|
||||
operatingSystem += " (error determining if containerized)"
|
||||
} else if inContainer {
|
||||
operatingSystem += " (containerized)"
|
||||
}
|
||||
}
|
||||
|
||||
meminfo, err := system.ReadMemInfo()
|
||||
|
|
Loading…
Add table
Reference in a new issue