[18.09] bump docker/engine

[kolyshkin]

1. Bump docker/engine to include [18.09 backport] Fix client version not being pinned when set, and some refactoring docker-archive/engine#188
2. Bump prometheus/* and swarmkit to match docker/engine's vendor.conf

[kolyshkin]

@andrewhsu@thaJeztah PTAL (related to docker-archive/engine#188)

[andrewhsu]

Hmm...something about unmount:

# github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount
vendor/github.com/docker/docker/pkg/mount/mount.go:126:9: undefined: unmount
vendor/github.com/docker/docker/pkg/mount/mount.go:144:9: undefined: unmount

[kolyshkin]

Hmm...something about unmount:

Ughm, I always forget to do git add after running vndr. Should be fixed now.

[andrewhsu]

Closer. Just PR check for ci/circleci: crossfailing:

# github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount
vendor/github.com/docker/docker/pkg/mount/unmount_unix.go:7:6: unmount redeclared in this block
previous declaration at vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go:9:39

[kolyshkin]

Error while building build/docker-darwin-amd64

# github.com/docker/cli/vendor/github.com/docker/docker/pkg/mount
vendor/github.com/docker/docker/pkg/mount/unmount_unix.go:7:6: unmount redeclared in this block
previous declaration at vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go:9:39

Hmm, I remember we have fixed this in upstream moby/moby. Yes, this is moby/moby#38372 which apparently needs to be backported to 18.09. Stay tuned... docker-archive/engine#379

[kolyshkin]

Marked as WIP as this needs docker-archive/engine#379 to be merged and then a re-vendor

[kolyshkin]

@thaJeztah PTAL. Also, does this actually fix a bug in the client?

[codecov-io]

Codecov Report

Merging #2100 into 18.09 will not change coverage.
The diff coverage is n/a.

@@ Coverage Diff @@## 18.09 #2100 +/- ##
=======================================
Coverage 54.28% 54.28% =======================================
Files 291 291 Lines 19459 19459 =======================================
Hits 10563 10563 Misses 8215 8215 Partials 681 681

[kolyshkin]

I have checked all the docker/engine's vendor.conf bumps that appeared in this PR and compared the new versions to those in cli's vendor.conf. It looks like all the components (changed in docker/engine vendor.conf) are of the same version in cli vendor.conf, except:

These ones are newer in cli: scratch that, the swarmkit in CLI is from 2018

component	version in engine's vendor.conf	version in cli's vendor.conf
docker/swarmkit	moby/swarmkit@142a737 (Jul 29 2019)	moby/swarmkit@cfa742c (Aug 19 2018)

These ones are older in CLI, and I'm going to bump those:

github.com/prometheus/*

[kolyshkin]

Updated with github.com/prometheus/* bumps to match those in docker/engine

[kolyshkin]

I wrote a half-assed script to figure out the differences in vendoring between the two; here is the script:

#!/bin/bashset -u
get_sha() {
ifecho -n $1| grep -qE '^[0-9a-f]{40}$';thenecho$1returnfi# figure it out the hard way#	go get -u $2 > /dev/null 2>&1
(cd $GOPATH/src/$2&& git rev-list -n 1 $1)
}
md_print() {
# alas this only works for githublocal url=https://$1local rc=$url/commit/$2local lc=$url/commit/$3echo"| "$rc" | "$lc" |"
}
echo"| version in docker/engine | version in cli |"echo"|---|---|"forPin$(grep -vE '^#|^$' vendor.conf | awk '{print $1}');do
V=$(grep -E "^$P[[:space:]]" vendor/github.com/docker/docker/vendor.conf | awk '{print $2}')
[ -z"$V" ] &&continue
LV=$(grep -E "^$P[[:space:]]" vendor.conf | awk '{print $2}')
[ "$V"="$LV" ] &&continue# versions might differ
V=$(get_sha $V$P)
LV=$(get_sha $LV$P)
[ "$V"="$LV" ] &&continue# versions differ
md_print $P$V$LVdone

and the results (alas links only work for github.com packages)

package	version in docker/engine	version in cli
github.com/containerd/containerd	containerd/containerd@9754871	containerd/containerd@bb0f83a
github.com/containerd/continuity	containerd/continuity@004b464	containerd/continuity@d8fb858
github.com/containerd/typeurl	containerd/typeurl@a93fcdb	containerd/typeurl@f694355
github.com/gogo/googleapis	gogo/googleapis@08a7655	gogo/googleapis@b235787
github.com/gogo/protobuf	gogo/protobuf@1adfc12	gogo/protobuf@636bf03
github.com/gorilla/context	gorilla/context@1ea2538	gorilla/context@08b5f42
github.com/gorilla/mux	gorilla/mux@0eeaf83	gorilla/mux@e3702be
github.com/matttproud/golang_protobuf_extensions	matttproud/golang_protobuf_extensions@3247c84	matttproud/golang_protobuf_extensions@c12348c
github.com/Microsoft/go-winio	microsoft/go-winio@97e4973	microsoft/go-winio@78a0846
github.com/Microsoft/hcsshim	microsoft/hcsshim@5b3eff5	microsoft/hcsshim@44c0601
github.com/opencontainers/runc	opencontainers/runc@96ec217	opencontainers/runc@20aff4f
github.com/opencontainers/runtime-spec	opencontainers/runtime-spec@5684b8a	opencontainers/runtime-spec@4e3b926
github.com/pkg/errors	pkg/errors@645ef00	pkg/errors@839d9e9
github.com/spf13/pflag	spf13/pflag@583c0c0	spf13/pflag@4cb166e
golang.org/x/sys	golang/sys@ac767d6	golang/sys@1b2967e
google.golang.org/genproto	googleapis/go-genproto@694d95b	googleapis/go-genproto@02b4e95
gotest.tools	gotestyourself/gotest.tools@b6e20af	gotestyourself/gotest.tools@1083505

[andrewhsu]

SGTM