1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

21804 Commits

Author SHA1 Message Date
Jessica Frazelle
2a3e0a22a4 add a way to only build requested pkgs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0bff2515f74fc6f0be9f019cc8b0f08b50e36228
Component: engine
2016-01-19 17:47:27 -08:00
Sebastiaan van Stijn
dd61cb6f47 Fix DockerTrustSuite SetUpTest
This hopefully makes DockerTrustSuite.SetUpTest
less flaky.

Increased the number of attempts to check
if Notary is available before giving up.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 910a5fc2348b934dcb126c021721305d5316c7c0
Component: engine
2016-01-19 16:45:47 -08:00
John Howard
cb9279d8f4 Windows: VirtualTerminalInput native console
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 33729d3b5a5f0c49bf14a387f87b918d1adedc48
Component: engine
2016-01-19 15:59:21 -08:00
Jessica Frazelle
16c01aa282 add warning if upgrading via script to migrate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 60d44d8b80dd693f5163f54293e6857b4fb3bb6a
Component: engine
2016-01-19 15:41:08 -08:00
Michael Crosby
7331395789 Update libcontainer to 47e3f834d73e76bc2a6a585b48d
This adds a fix for the resource struct in the cgroups type and seccomp
IsEnabled function

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5f73ab89523d240c61d8e745bc106232891b46f7
Component: engine
2016-01-19 15:34:08 -08:00
Sebastiaan van Stijn
617e630788 Merge pull request #19458 from dmcgowan/layerstore-error-handling
Add more robust error handling on layer store creation
Upstream-commit: e11a7f53719cade69ef8553a71d2d6f025acde98
Component: engine
2016-01-19 14:37:23 -08:00
Jess Frazelle
de82678777 Merge pull request #19462 from tophj-ibm/fix-arm-integration-cli-requirement
Fix test requirement for ARM
Upstream-commit: 389784abe1f82a385f363acc328e2ecdbdcc6eb3
Component: engine
2016-01-19 14:24:28 -08:00
Madhu Venugopal
8e77159989 IT for remote network driver & ungraceful restart
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8799218d01785aa056c2f1f06f3735c3e93496b4
Component: engine
2016-01-19 14:09:11 -08:00
Madhu Venugopal
795bea682d Vendor libnetwork v0.6.0-rc1
- Fixes docker/docker#19404
- Fixes ungraceful daemon restart issue in systemd with remote
  network plugin (https://github.com/docker/libnetwork/issues/813)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ee3b42f385cdb41b2996b4b64f4f319adb62ad03
Component: engine
2016-01-19 13:50:17 -08:00
Aaron Lehmann
28d6652c84 Vendor updated docker/distribution package
Fixes #19400

Note that this introduces an incompatibility with Docker 1.10-rc1,
because the media type used for schema1 manifests has been corrected in
the upstream distribution code. Docker 1.10-rc1 won't be able to pull
old manifests from Registry 2.3-rc0 and up, but because of this vendor
update, Docker 1.10-rc2 won't have this problem.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 588e27f9a57cc2e2cdd84f49cf8cb5a7caed467b
Component: engine
2016-01-19 13:28:51 -08:00
Doug Davis
e398bcd1ae Merge pull request #19460 from LK4D4/remove_comment
Remove obsolete comment
Upstream-commit: c18b4943eaeee8900b844aec09b77763696b6c3d
Component: engine
2016-01-19 15:29:46 -05:00
Christopher Jones
d154b3d30f Fix test requirement for ARM
Correctly passes the DOCKER_ENGINE_GOARCH env var
to the testing environment

Also fixes logic for skipping a test if on ARM.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: d12f4babdd08acd3cf64c2ee4a9550c81d534816
Component: engine
2016-01-19 15:23:46 -05:00
Alexander Morozov
d9d4f4eb39 Remove obsolete comment
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3dc8829a83d72d3a8e1d9b6a88c9e6ff9ecaf4a0
Component: engine
2016-01-19 12:17:40 -08:00
Steve Durrheimer
c2e2353aea Add zsh completion for 'docker network create --ipam-opt' + Reordering for better maintainability
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: da26fc26b21606c085ae04ad75c1aaa7e79939f4
Component: engine
2016-01-19 21:16:16 +01:00
Sebastiaan van Stijn
b4e2edd4ca Merge pull request #19385 from runcom/better-git-error
api: client: build: do not fall through if git isn't installed
Upstream-commit: 4b63689679089f7bb2286e7c330d6a7884c0aec3
Component: engine
2016-01-19 11:39:05 -08:00
Derek McGowan
2c24be81fc Add more robust error handling on layer store creation
Add continue when layer fails on store creation
Trim whitespace from layerstore files to keep trailing space from failing a layer load

Fixes #19449

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: caef48f4e25eb56ae9d63aa58bea588891bed944
Component: engine
2016-01-19 11:17:08 -08:00
David Calavera
793bc88c21 Extract container store from the daemon.
- Generalize in an interface.
- Stop abusing of List for everything.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3c82fad44112dc73861f325bbecd68b9922b0ad3
Component: engine
2016-01-19 13:21:41 -05:00
Morton Fox
d25929e0ac cgroups documentation moved
Signed-off-by: Morton Fox <github@qslw.com>
Upstream-commit: 596836e0e406f92cd68c19ee861fd7c0a3b21806
Component: engine
2016-01-19 11:26:58 -05:00
Antonio Murdaca
dca237fb71 api: client: build: do not fall through if git isn't installed
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 167cc42986c8939c7aacf73570adaf19b8cad0b3
Component: engine
2016-01-19 16:50:14 +01:00
Tibor Vass
66b0f4bcad Merge pull request #19432 from jfrazelle/fix-x32
add send, recv, and x32 so we can install i386 pkgs on amd64
Upstream-commit: 30e42a27991377e4b278dee089436bc57ee04a4d
Component: engine
2016-01-19 10:20:01 -05:00
Tibor Vass
b14ba840fe Merge pull request #19424 from aaronlehmann/revert-multiple-pull-errors
Revert reporting of multiple pull errors
Upstream-commit: e8ce350669b0b8096ef2bb365ecad6fbfa966bfb
Component: engine
2016-01-19 09:51:54 -05:00
Vincent Demeester
6e2509f508 Merge pull request #19426 from sanimej/restart
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
Upstream-commit: 011ca5f206ed2ffaf8a7871da4ea44c6d03cafd6
Component: engine
2016-01-19 10:28:33 +01:00
Vincent Demeester
b6ea559472 Merge pull request #19437 from HackToday/fixulimit
Fix ulimit command form
Upstream-commit: 05e36d254f4310a93df7f5818e85721c3e180d91
Component: engine
2016-01-19 10:26:02 +01:00
Vincent Demeester
53e905757e Merge pull request #19436 from HackToday/fixhostdev
Fix add host device example
Upstream-commit: 25f4f7151221d6a0ebb9185c03cef812ac24825d
Component: engine
2016-01-19 10:25:08 +01:00
Sebastiaan van Stijn
8586a19d86 Merge pull request #19433 from HackToday/fixclidoc
Fix the privileged example
Upstream-commit: 0f04f3ba9fa81ff10424a7ef93718f8ea1dc7262
Component: engine
2016-01-19 00:37:30 -08:00
Kai Qiang Wu(Kennan)
0028abf222 Fix ulimit command form
The ulimit is builtin, so we need shell form to execute it.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 98e5a8efcc390d2b5de18049e3227db7a257c232
Component: engine
2016-01-19 07:44:58 +00:00
Antonio Murdaca
3a7ad6768a Merge pull request #19429 from mavenugo/epv21
nil ptr check for endpointsettings when used with older clients
Upstream-commit: 6a1100cafcab1bb0775ffcd13125cbc949e3fb06
Component: engine
2016-01-19 08:43:04 +01:00
Kai Qiang Wu(Kennan)
debdc9b3c1 Fix add host device example
The example is not right in parameter, and also
one command is same as first one, it should be typo
before, we should use 'rw' as example for that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 62b525f75dbdb78f8ae7ee7f6b2cac2d262dc4dd
Component: engine
2016-01-19 07:00:58 +00:00
Kai Qiang Wu(Kennan)
d68b8b9b1f Fix the privileged example
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 3cc5550003c0b11db572f64c9fc801cde0c7447a
Component: engine
2016-01-19 06:41:49 +00:00
Lei Jitang
99e8dc11f9 Merge pull request #19431 from WeiZhang555/19422-default-network
bugfix: prevent creating network 'default'
Upstream-commit: 42ee908b3faa231322052c27d9ec8ffebc1c40eb
Component: engine
2016-01-19 14:18:20 +08:00
yangshukui
c91af62049 remove the check of ContentLength in TestApiStatsNoStreamGetCpu
Signed-off-by: yangshukui <yangshukui@huawei.com>
Upstream-commit: d474f7fb86779aa15ea302f269bfc8d00ad379ec
Component: engine
2016-01-19 12:06:01 +08:00
Jessica Frazelle
6541731269 add send, recv, and x32 so we can install i386 pkgs on amd64
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 308eff99e8468be4e92951de0ac69b27042a833b
Component: engine
2016-01-18 19:24:01 -08:00
Zhang Wei
187ffe612a bugfix: prevent creating network 'default'
Default is predefined network and is reserved, so we should stop user
from creating network with name `default`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 31dae442c8a640694209c7451d6e9bf644aa2743
Component: engine
2016-01-19 11:06:36 +08:00
Madhu Venugopal
54242d411e nil ptr check for endpointsettings when used with older clients
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 35dbce109bc1128e4abb2bd726055c2daa4842af
Component: engine
2016-01-18 17:15:59 -08:00
Brian Goff
5779f0bfc3 Merge pull request #19420 from clnperez/close-notify-fix
Move closeNotify to fix panic with newer golang
Upstream-commit: b6be6451971afc7798c1aa22ff73d681c4e0019b
Component: engine
2016-01-18 20:08:25 -05:00
Aaron Lehmann
8a0c8b1a34 Revert reporting of multiple pull errors
Revert the portions of #17617 that report all errors when a pull
falls back, and go back to just reporting the last error. This was nice
to have, but causes some UX issues because nonexistent images show
additional "unauthorized" errors.

Keep the part of the PR that handled ENOSPC, as this appears to work
even without tracking multiple errors.

Fixes #19419

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 87338bf0fa97c905d2d707393c95f73aea398cad
Component: engine
2016-01-18 15:49:08 -08:00
Jess Frazelle
d08e97ec27 Merge pull request #19196 from Microsoft/jjh/tp4ci
Windows CI: Setup for testing against Windows
Upstream-commit: 637f49b5af6ac61cce6fadc4a3b8264ec14ca29b
Component: engine
2016-01-18 15:22:08 -08:00
Jess Frazelle
acdedd40ae Merge pull request #19412 from hypriot/skip-tests-on-arm
Skip failing tests on ARM to get red/green feedback from Jenkins
Upstream-commit: 416de85359201676f503911459203cd7c07e4eaf
Component: engine
2016-01-18 14:40:46 -08:00
Jessica Frazelle
4562635fa9 disable install of docker-engine for 1.10, try to get ready for 1.11
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c4bc9657b9e52f12b37aa36da15c1a2eb86519a3
Component: engine
2016-01-18 13:38:29 -08:00
Antonio Murdaca
88549196d4 Merge pull request #19414 from anusha-ragunathan/postBuild
Make daemonbuilder.Docker leaner.
Upstream-commit: a495c148a5948c372c626c6a4643d361f31374d0
Component: engine
2016-01-18 21:46:49 +01:00
Christy Perez
1fa4309fd5 Move closeNotify to fix panic with newer golang
This is happening now due to improvements in net/http:
99fb19194c

To test, change the go version in the Dockerfile:
-ENV GO_VERSION 1.5.3
+ENV GO_VERSION 1.6beta2

More info here: https://github.com/golang/go/issues/14001

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 2df5dafdaf12296fa2bd92ced62ba80da41af744
Component: engine
2016-01-18 14:24:25 -06:00
Brian Goff
980b654418 Merge pull request #19372 from cloudflare/fix-log-copier
only close LogDriver after LogCopier is done
Upstream-commit: 3044a08326de43617a3b1328b86ccc89ffe0641d
Component: engine
2016-01-18 14:38:34 -05:00
Brian Goff
e1f805562a Merge pull request #19391 from cdauth/systemd_tasks_max
Set TasksMax in addition to LimitNPROC in systemd service files
Upstream-commit: 2cd74f99322403ae6de5ee75c05343b3b35a2645
Component: engine
2016-01-18 13:33:07 -05:00
Jess Frazelle
f2b1bc3c40 Merge pull request #19310 from tophj-ibm/add-registry-remove-notary-on-power
update registry and remove notary on ppc64le
Upstream-commit: afa9b75c7c144586b628afec8a2fece70e9b9769
Component: engine
2016-01-18 09:51:02 -08:00
Jess Frazelle
385165a58c Merge pull request #19410 from tophj-ibm/add-gccgo-target-to-makefile
Add gccgo target to Makefile
Upstream-commit: a7652ad2764f56d5a960f87e110f9fb34641a800
Component: engine
2016-01-18 09:50:44 -08:00
Daniel Dao
5ce70c9580 only close LogDriver after LogCopier is done
this prevents the copier from sending messages in the buffer to the closed
driver. If the copied took longer than the timeout to drain the buffer, this
aborts the copier read loop and return back so we can cleanup resources
properly.

Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
Upstream-commit: 84e14754e1ef3b089442398a31c5c5813fa9a1b6
Component: engine
2016-01-18 17:47:57 +00:00
Anusha Ragunathan
bd1120dfd8 Make daemonbuilder.Docker leaner.
Currently builder.Backend is implemented by daemonbuilder.Docker{} for
the daemon. This registration happens in the API/server code. However,
this is too implementation specific. Ideally we should be able to specify
that docker daemon (or any other) is implementing the Backend and abstract
the implementation details. So we should remove package daemonbuilder
dependency in build_routes.go

With this change, daemonbuilder.Docker is nothing more than the daemon.
A follow on change will remove the daemonbuilder package and move relevant
methods under daemon, so that API only knows about the backend.

Also cleanup code in api/client/build.go. docker cli always performs build
context tar download for remoteURLs and sends an empty remoteContext. So
remove relevant dead code.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 14215ed5a1900a88a3b17dd7cd566def50bfcbc9
Component: engine
2016-01-18 09:16:11 -08:00
Tianon Gravi
a84ec93f11 Merge pull request #19409 from albers/completion-network-links
bash completion for container linking and aliasing
Upstream-commit: 8a4b4f5950dc85dc987dd7363495cbc38bf77972
Component: engine
2016-01-18 08:36:33 -08:00
Tianon Gravi
8e468d6f8f Merge pull request #19411 from albers/completion-network-create--internal
Update bash completion for `docker network create`
Upstream-commit: f5299b64aaed12e275d67c0d2022717a8d84ca92
Component: engine
2016-01-18 08:34:59 -08:00
Stefan Scherer
d22cc489e9 Skip failing tests on ARM to get red/green feedback from Jenkins
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 4f339570cbd3cc57f5410c4ca08c7d7e03e6e56f
Component: engine
2016-01-18 17:00:15 +01:00