[18.04] backport Fix error with merge composefile with networks…

[thaJeztah]

backport of docker/cli#981 and docker/cli#983 for 18.04

git checkout -b 18.04-backport-972-fix-merge-network upstream/18.04
git cherry-pick -s -S -x -Xsubtree=components/cli 2ee9635b1e7163aaea285a2f58033575f8b0e4ed
git cherry-pick -s -S -x -Xsubtree=components/cli 0122730faf7136feb020078058537382fcc8413e
git push -u origin 18.04-backport-972-fix-merge-network

no conflicts

[vdemeester]

LGTM 🐓

[thaJeztah]

Some weird failures;

16:56:10 + docker run --rm -v /home/docker/workspace/docker-ce-pr-ppc64le:/workspace busybox chown -R 1001:1001 /workspace
16:56:10 Unable to find image 'busybox:latest' locally
16:56:10 latest: Pulling from library/busybox
16:56:10 docker: no matching manifest for linux/ppc64le in the manifest list entries.

16:57:48 Get:8 http://deb.debian.org/debian stretch/main ppc64el Packages [9291 kB]
16:57:50 Fetched 9577 kB in 2s (4178 kB/s)
16:57:51 Reading package lists...
16:57:51 E: Failed to fetch http://security.debian.org/dists/stretch/updates/main/binary-ppc64el/Packages.gz  Writing more data than expected (435322 > 434901)
16:57:51    Hashes of expected file:
16:57:51     - Filesize:434901 [weak]
16:57:51     - SHA256:90a7bbef8da40c26155c2e257a11f99b5cd73569dffdc901b2b760986714091d
16:57:51     - SHA1:715ef31b9c78a7376cba8977de17f19d0b098490 [weak]
16:57:51     - MD5Sum:718b5123db9794117e007da59f9ded8b [weak]
16:57:51    Release file created at: Wed, 04 Apr 2018 23:02:22 +0000
16:57:51 E: Some index files failed to download. They have been ignored, or old ones used instead.

[jose-bigio]

Recking Re-kicking job for PowerPC saw failure of

java.io.IOException: remote file operation failed: /home/docker/workspace/docker-ce-pr-ppc64le at hudson.remoting.Channel@13c6f483:JNLP4-connect connection from ip-172-31-0-216.us-west-2.compute.internal/172.31.0.216:12920: hudson.remoting.ChannelClosedException: Remote call on JNLP4-connect connection from ip-172-31-0-216.us-west-2.compute.internal/172.31.0.216:12920 failed. The channel is closing down or has closed down

Still failed

java.nio.channels.ClosedChannelException

Is this a node problem with the PowerPCs?

[seemethere]

LGTM

[andrewhsu]

Closing this PR because not making anymore releases on the 18.04 codeline.