1
0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Commit Graph

247 Commits

Author SHA1 Message Date
Alexander Morozov
7eead35e44 Update runc to introduce RelabelNeeded function
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 00bcc924fa64b16484beeeabbd2969572d03d30d
Component: engine
2015-11-09 10:03:25 -08:00
Vincent Demeester
97dac59e9f Vendor mattn/go-shellwords
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b09a452c1f89e84b513ed7eaf567437291e0e50d
Component: engine
2015-11-05 19:59:28 +01:00
Jana Radhakrishnan
bafe2d42bf Fix a corner case issue when daemon panics
There is an extreme corner case where when the daemon
panics at the same time as a container is stopping
and cleaning up the sandbox and the sandbox may have been
left with an inconsistent state. This libnetwork vendoring
fixes that case.

Vendoring in libnetwork @ 5305ea570b85d61dd0fd261cd7e1680da1884678

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 79cffa5ce4a71b29eed66e26c1fb7f153be5c045
Component: engine
2015-11-02 18:37:35 -08:00
Derek McGowan
e8b4f63208 Merge pull request #17557 from aaronlehmann/update-distribution
Vendor updated version of docker/distribution
Upstream-commit: 6964f4235035c5e94f6a0c35149783e910fed313
Component: engine
2015-11-02 14:37:04 -08:00
Aaron Lehmann
bf1b372cbc Vendor updated version of docker/distribution
This updates the vendored docker/distribution to the current master
branch.

Note the following changes:

- The manifest package was split into manifest/schema1. Most references
  to the manifest package in the engine needed to be updated to use
  schema1 instead.

- Validation functions in api/v2 were replaced by the
  distribution/reference package. The engine code has been updated to
  use the reference package for validation where necessary. A future PR
  will change the engine to use the types defined in
  distribution/reference more comprehensively.

- The reference package explicitly allows double _ characters in
  repository names. registry_test.go was updated for this.

- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
  that the schema1 package unmarshals the correct payload. The test is
  being changed to modify the JSON without affecting its length, which
  allows the pull to succeed to the point where digest validation
  happens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 257c59251bd9a03aea4f3188a8160c54f37950ae
Component: engine
2015-11-02 12:40:18 -08:00
David Calavera
88f746d118 Merge pull request #17619 from jfrazelle/canonical-update
rebased canonical/json off go 1.5.1
Upstream-commit: b95048758a06097469901590e68f40bafb5d1762
Component: engine
2015-11-02 11:42:26 -08:00
Jessica Frazelle
9601e97681 rebased canonical/json off go 1.5.1
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0d881349e88b55a3ea4e15eef1c464b2ca64a441
Component: engine
2015-11-02 10:23:02 -08:00
Jana Radhakrishnan
106476f022 Vendoring libnetwork
Vendoring libnetwork @ 05a5a1510f85977f374a9b9804a116391bab5089

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 10e1b9f02ee633349bc45631dac18cb4cc5baa61
Component: engine
2015-11-02 08:33:52 -08:00
Madhu Venugopal
cc98d1ba33 Vendoring in libnetwork to fix an ungraceful restart case
Also picked up a minor typo fix

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2361edbcea22113aea639a3d74edb35791fd8aef
Component: engine
2015-10-30 16:24:02 -07:00
Brian Goff
d73613b841 Merge pull request #17514 from mavenugo/ugr
Fixing a case of dangling endpoint during ungraceful daemon restart
Upstream-commit: 17a8fbeaebf1991fa8d97adb3f217edbecd651ea
Component: engine
2015-10-30 13:38:27 -04:00
Tibor Vass
9514b66cfb Merge pull request #16640 from samuelkarp/awslogs-logging-driver
[awslogs] Auto-detect region and set user-agent
Upstream-commit: c545dce004a4b833994478a2fc993ee8e2b3b2cd
Component: engine
2015-10-30 12:38:40 -04:00
Madhu Venugopal
8c783d1695 Vendoring libnetwork to solve an ungraceful restart condition
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ebf76171f6d63938558cdd5bef33565b48d664b7
Component: engine
2015-10-29 18:56:17 -07:00
Alexander Morozov
f8757c11b0 Merge pull request #17490 from aboch/pm
Libnetwork vendoring & overlay networking fixes
Upstream-commit: 7f7950aa187e551bdc4d6128523207c2b8343250
Component: engine
2015-10-29 13:45:19 -07:00
Alessandro Boch
4a8db513f4 Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 90744fe9432d988bae187a8dab7c606b2dc13895
Component: engine
2015-10-29 09:24:48 -07:00
Qiang Huang
ff53341015 Bump bolt to v1.1.0
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a41917c2c88bd7f694d141ac67f4a194aaa16fa1
Component: engine
2015-10-28 08:49:45 +08:00
Samuel Karp
2e7de41d92 Update vendored aws-sdk-go
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 70083e6fc3a7f64755fcf4752e6d24758bdd0543
Component: engine
2015-10-27 23:43:51 +00:00
Santhosh Manohar
1c1efd72ec Vendor in libnetwork changes to support container rename
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 1041f3967086052438a3e34cee3db14e2277b629
Component: engine
2015-10-23 16:27:03 -07:00
David Calavera
7c4b8bccf9 Merge pull request #17381 from mavenugo/rc3v1
Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Upstream-commit: 91de5ddf1896347c05f5292b8a0de0fbad3e4ce2
Component: engine
2015-10-26 17:06:01 -07:00
David Calavera
b67a8a66b5 Merge pull request #17285 from Microsoft/10662-exectp4workaround
Windows [TP4] Trap Hyper-V exec failure
Upstream-commit: fe1e04a84f51b3abf5fd426a6a4ee0125683aa11
Component: engine
2015-10-26 16:47:51 -07:00
Madhu Venugopal
0759578039 Vendoring in libnetwork with fixes for issues identified in RC1 & RC2
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 139d1e13e29ed987face1494471fdb6c986d6c4a
Component: engine
2015-10-26 13:56:56 -07:00
John Howard
878c53917a Windows [TP4] HCSShim Revendor
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a3c43964cf994cc1315af1590155f63dc588e32c
Component: engine
2015-10-23 08:41:30 -07:00
Madhu Venugopal
c31c8acf2e Vendoring in libkv to be aligned with libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 793b20ba093acedfb53ea2a3344601322e97893f
Component: engine
2015-10-22 14:12:46 -07:00
Madhu Venugopal
58a78457b3 Vendoring in Libnetwork
This carries fixes for
- Internal racy /etc/hosts updates within container during SD
- Renable SD service record watch after cluster-store restarts
- Fix to allow remote IPAM driver to return no IP if the user prefers
- Fix to allow --fixed-cidr and --bip to be in same range

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 52df87ac2b83693a48efcdc7167575449f122e25
Component: engine
2015-10-22 14:12:46 -07:00
Alessandro Boch
2bfb10b6f8 Vendoring in libnetwork for the anonymous endpoint
- commit f3c8ebf46b890d4612c5d98e792280d13abdb761

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 1be540b99bdf7557d4c3183b822b5bea230b0141
Component: engine
2015-10-21 09:32:48 -07:00
Tibor Vass
b1184809c8 Merge pull request #17229 from mavenugo/ds_fix
Fixing bootup inconsistencies due to invalid cluster-store config
Upstream-commit: bb5551746bdccc1b032fbf8c32914c282ff94668
Component: engine
2015-10-21 12:00:07 -04:00
Madhu Venugopal
82f86233a6 Vendoring in libnetwork to fix daemon bootup instabilities
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2de2192c27bf72e5036e9914b984ab6d71f70c60
Component: engine
2015-10-20 19:56:59 -07:00
David Lawrence
72a0fc71b0 some bugfixes on getting tuf files, this is backed by a lot of new unit tests in gotuf
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
Upstream-commit: 43ba8a0426e9414c936d6f5fdab9bb0311fb7b8c
Component: engine
2015-10-20 13:22:06 -07:00
Jana Radhakrishnan
f3edec8c49 Vendoring libnetwork
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052

Has bug fixes for 1.9

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 9750dd0088bbb23968a19a74f5ae8c58b56328fc
Component: engine
2015-10-19 21:29:26 -07:00
Sebastiaan van Stijn
c93afd4f9e Merge pull request #17056 from vdemeester/16756-integration-cli-checkers-api-build
Vendoring new go-check checkers and use checker for docker_api_build_test.go
Upstream-commit: cffd50752c2b2243519193a4ca458156291eb8af
Component: engine
2015-10-17 08:50:51 -07:00
Vincent Demeester
e7f314a486 Vendoring shakers library and update go-check
The shakers library defines a bunch of go-check checkers to ease
writing tests.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9685b4767fc49c4a43ba762a5afbcd175f3d9245
Component: engine
2015-10-17 14:28:08 +02:00
Madhu Venugopal
b9ef35ce38 Vendoring libnetwork to Replace the label variable to DriverOpts
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: cf1b5fe6011e49d19e2b27792d6f28fd6cd8984e
Component: engine
2015-10-16 14:30:57 -07:00
David Lawrence
98ece668a9 updating notary and gotuf with latest bugfixes
Signed-off-by: David Lawrence <david.lawrence@docker.com>
Upstream-commit: 7ce9f0275130b66241f9077485d14e25c641cc3d
Component: engine
2015-10-16 09:33:26 -07:00
David Calavera
30e90c5ea6 Merge pull request #16997 from Microsoft/10662-kill-parttwo
Windows: [TP4] docker kill handling part two
Upstream-commit: e1804098b9c9ebb6210af29045198bd5259bb834
Component: engine
2015-10-15 14:42:19 -07:00
Michael Crosby
1dd7cd942b Merge pull request #16989 from tiborvass/bump-libcontainer-for-docker-1.9
Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
Upstream-commit: 3ad9cc996a3daf0c3f05972141bdfc6d8126d705
Component: engine
2015-10-13 16:56:19 -07:00
John Howard
803f14d503 Windows: [TP4] docker kill handling
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: bc503ca8ab2303066cc64d752ffff05100a9b267
Component: engine
2015-10-13 16:04:49 -07:00
Tibor Vass
055fc64475 Bump libcontainer to 6c198ae2d065c37f44316e0de3df7f3b88950923
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: a17e53038d15ebb82f2dcdafb5c429609cccfb0d
Component: engine
2015-10-13 15:48:13 -07:00
Daniel Hiltgen
22d67b7818 Bump to latest libkv/libnetwork + dependencies
The latest libkv uses a different etcd library.  Unfortunately
that library uses some funky import paths, so I've added a new cleanup
routine for our vendor scripts to be able to normalize the imports
to be consistent with how imports work in this tree.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 7078e7ddf42ad0beeb61e82cb1544d74def98adf
Component: engine
2015-10-13 14:41:43 -07:00
Alexandre Beslic
0e3861a2d2 Merge pull request #16910 from mavenugo/ipam
Vendoring libnetwork for the pluggable IPAM driver support
Upstream-commit: 4ea3ff70618d28520d2ae787bd00206d05c9f1db
Component: engine
2015-10-13 14:41:19 -07:00
Madhu Venugopal
b5732f7da4 Vendoring in libnetwork ipam support
* Pluggable IPAM driver support
* Performance and Scalability enhancements
* Libkv fixes in multiple backend stores

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2e3113aeef08c9e7fa4f9cb0fd3d53185d492b99
Component: engine
2015-10-13 10:52:49 -07:00
Aaron Lehmann
a4f5e10d65 Remove trust package
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: cba4bbad4f0e03d782a22f57d653d3109bca0208
Component: engine
2015-10-12 10:51:28 -07:00
Alexander Morozov
ddc5f041c8 Merge pull request #16867 from dmcgowan/distribution-upstream-name-change
Update distribution package for name regexp change
Upstream-commit: 90e733f0b1ca570657cee2222b0ad1775d096619
Component: engine
2015-10-09 10:09:23 -07:00
Derek McGowan
505ac314c6 Update distribution package
Pick up name regexp change in distribution to allow matching of hostnames as a valid component of a repository.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: b5b0da5fec235df864f5d84292b277aee80e5e3a
Component: engine
2015-10-08 17:16:43 -07:00
Brian Goff
59099af0ea Bump runc
Fixes a race when starting a container when there is an error, the stdio
streams are not always written.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d9f5f1954cf3ba9c1f9644d7997033d5d62ab34b
Component: engine
2015-10-08 17:07:00 -04:00
Arnaud Porterie
6b3f6691b5 Merge pull request #16645 from mavenugo/ux
Docker Network UX & remote API changes
Upstream-commit: 8e31036816e200dfe54cc2205235de7dea54bcd0
Component: engine
2015-10-07 10:44:58 -07:00
Madhu Venugopal
45997573a5 Network UX and integration tests
* Exiting experimental network UX
* removed experimental service UX
* integrated with the new network remote API

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 22a9ba090eb3cc1bc6c851785a876b064df7341a
Component: engine
2015-10-07 03:54:27 -07:00
Madhu Venugopal
8623fdfb48 Network remote APIs using new router, --net=<user-defined-network> changes
* Moving Network Remote APIs out of experimental
* --net can now accept user created networks using network drivers/plugins
* Removed the experimental services concept and --default-network option
* Neccessary backend changes to accomodate multiple networks per container
* Integration Tests

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2ab94e11a2a8499088a72ab27fd09e897d8c810a
Component: engine
2015-10-07 03:54:19 -07:00
Antonio Murdaca
e9bd508682 bump libcontainer to 902c012e85cdae6bb68d8c7a0df69a42f818ce96
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 753901343624f15264b46fe9ade01cf451be99f1
Component: engine
2015-10-06 17:55:09 +02:00
Arnaud Porterie
250a07900f Merge pull request #16718 from mavenugo/discovery
Vendoring libnetwork integrated with Docker discovery service
Upstream-commit: 33e9d70c82a9dee04e5e6d50dd890a6b96650b0a
Component: engine
2015-10-05 12:06:36 -07:00
Vincent Demeester
9c4712a315 Remove use of testify mock and testify vendored lib
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fbd0cea90cec03b233453592996627e88af70f8d
Component: engine
2015-10-05 08:43:34 +02:00
Madhu Venugopal
d0c8047b82 Vendoring in libnetwork integrated with Docker Discovery
This commit brings in end to end integration of Docker Discovery with
libnetwork multi-host networking.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 956fbccdaa52e3dedac53b039671de1fd7f54d02
Component: engine
2015-10-02 13:07:44 -07:00