Merge pull request #7350 from greut/docker-18.09.9

docker: v18.09.9
hashicorp · Mar 15, 2020 · d1f40c8 · d1f40c8
2 parents 240b09b + 600186d
commit d1f40c8
Show file tree

Hide file tree

Showing 508 changed files with 82,664 additions and 80,423 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/config/commands/install-consul.yml b/.circleci/config/commands/install-consul.yml
@@ -1,7 +1,7 @@
 parameters:
   version:
     type: string
-    default: 1.6.1
+    default: 1.6.4
 steps:
   - run:
       name: Install Consul << parameters.version >>

diff --git a/.circleci/config/commands/install-vault.yml b/.circleci/config/commands/install-vault.yml
@@ -1,7 +1,7 @@
 parameters:
   version:
     type: string
-    default: 1.2.3
+    default: 1.2.4
 steps:
   - run:
       name: Install Vault << parameters.version >>

diff --git a/client/stats/cpu.go b/client/stats/cpu.go
@@ -5,6 +5,7 @@ import (
 	"time"
 
 	shelpers "github.com/hashicorp/nomad/helper/stats"
+	"github.com/shirou/gopsutil/cpu"
 )
 
 // CpuStats calculates cpu usage percentage
@@ -59,3 +60,31 @@ func (c *CpuStats) calculatePercent(t1, t2 float64, timeDelta int64) float64 {
 	overall_percent := (vDelta / float64(timeDelta)) * 100.0
 	return overall_percent
 }
+
+func (h *HostStatsCollector) collectCPUStats() (cpus []*CPUStats, totalTicks float64, err error) {
+
+	ticksConsumed := 0.0
+	cpuStats, err := cpu.Times(true)
+	if err != nil {
+		return nil, 0.0, err
+	}
+	cs := make([]*CPUStats, len(cpuStats))
+	for idx, cpuStat := range cpuStats {
+		percentCalculator, ok := h.statsCalculator[cpuStat.CPU]
+		if !ok {
+			percentCalculator = NewHostCpuStatsCalculator()
+			h.statsCalculator[cpuStat.CPU] = percentCalculator
+		}
+		idle, user, system, total := percentCalculator.Calculate(cpuStat)
+		cs[idx] = &CPUStats{
+			CPU:    cpuStat.CPU,
+			User:   user,
+			System: system,
+			Idle:   idle,
+			Total:  total,
+		}
+		ticksConsumed += (total / 100.0) * (shelpers.TotalTicksAvailable() / float64(len(cpuStats)))
+	}
+
+	return cs, ticksConsumed, nil
+}
diff --git a/client/stats/cpu_unix.go b/client/stats/cpu_unix.go
diff --git a/client/stats/cpu_windows.go b/client/stats/cpu_windows.go
diff --git a/client/stats/host.go b/client/stats/host.go
@@ -275,7 +275,7 @@ func (h *HostCpuStatsCalculator) Calculate(times cpu.TimesStat) (idle float64, u
 	currentSystem := times.System
 	currentTotal := times.Total()
 	currentBusy := times.User + times.System + times.Nice + times.Iowait + times.Irq +
-		times.Softirq + times.Steal + times.Guest + times.GuestNice + times.Stolen
+		times.Softirq + times.Steal + times.Guest + times.GuestNice
 
 	deltaTotal := currentTotal - h.prevTotal
 	idle = ((currentIdle - h.prevIdle) / deltaTotal) * 100

diff --git a/demo/vagrant/Vagrantfile b/demo/vagrant/Vagrantfile
@@ -35,7 +35,7 @@ sudo chmod a+w /etc/nomad.d
 
 
 echo "Installing Consul..."
-CONSUL_VERSION=1.6.1
+CONSUL_VERSION=1.6.4
 curl -sSL https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip > consul.zip
 unzip /tmp/consul.zip
 sudo install consul /usr/bin/consul

diff --git a/drivers/docker/driver_default.go b/drivers/docker/driver_default.go
@@ -3,8 +3,8 @@
 package docker
 
 import (
+	"github.com/docker/docker/daemon/caps"
 	docker "github.com/fsouza/go-dockerclient"
-	"github.com/moby/moby/daemon/caps"
 )
 
 func getPortBinding(ip string, port string) []docker.PortBinding {

diff --git a/scripts/vagrant-linux-priv-consul.sh b/scripts/vagrant-linux-priv-consul.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-VERSION="1.6.1"
+VERSION="1.6.4"
 DOWNLOAD=https://releases.hashicorp.com/consul/${VERSION}/consul_${VERSION}_linux_amd64.zip
 
 function install_consul() {

diff --git a/vendor/github.com/Microsoft/hcsshim/LICENSE b/vendor/github.com/Microsoft/hcsshim/LICENSE