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

299 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
25aab1428e Merge pull request #18587 from calavera/daemon_configuration_file
Allow to set daemon and server configurations in a file.
Upstream-commit: e44364eae90784b423eee8b2969bda9cd2429746
Component: engine
2016-01-14 16:44:58 -08:00
Tibor Vass
c8a4568d47 Merge pull request #19109 from BrianBland/crossRepositoryPush
Cross repository push
Upstream-commit: 94b2d5669016be0063abbcb6917026bdfb52478c
Component: engine
2016-01-14 18:50:53 -05:00
Brian Bland
bcd131a7aa Changes cross-repository blob mounting to a blob Create option
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata

Signed-off-by: Brian Bland <brian.bland@docker.com>
Upstream-commit: 63099477189ea14f3122f6aa37fa7c60d33562c7
Component: engine
2016-01-14 14:26:03 -08:00
Alessandro Boch
b8b2e1e984 Vendoring libnetwork v0.5.5
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 4e4ba9dd3a1d488cf9d808f35904ce59911a55de
Component: engine
2016-01-14 10:34:00 -08:00
David Calavera
d9690fd0d0 Vendor merge structure tool.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1666707cf895e9de63aedaf744ae4923c41f73d2
Component: engine
2016-01-14 11:58:38 -05:00
David Calavera
680642b7a4 Vendor engine-api 0.2.2.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7a5d8974109ec34e9fb752b2935077eb8da7a229
Component: engine
2016-01-13 20:09:47 -05:00
Brian Bland
7afe53c8eb Adds cross-repository blob pushing behavior
Tracks source repository information for each blob in the blobsum
service, which is then used to attempt to mount blobs from another
repository when pushing instead of having to re-push blobs to the same
registry.

Signed-off-by: Brian Bland <brian.bland@docker.com>
Upstream-commit: 7289c7218e2101eb94fb90f2cb22e1412d016984
Component: engine
2016-01-13 14:26:30 -08:00
Tibor Vass
296f98f18e Merge pull request #19267 from mavenugo/vin-ln
Vendor libnetwork v0.5.4
Upstream-commit: 46eb4700391e8462756000d584337a763bc563c6
Component: engine
2016-01-13 07:09:58 -05:00
Madhu Venugopal
fb043c8580 Vendor libnetwork v0.5.4
- Removed the isNodeAlive protection when user forces an endpoint delete

- Bridge driver supporting internal network option
- Backend implementation to support "force" option to network disconnect
- Fixing a regex in etchosts package to fix docker/docker#19080

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 537089481fd9f6859d851a76b67a4f80e0e3691e
Component: engine
2016-01-12 20:42:30 -08:00
Jessica Frazelle
fb652937c3 read seccomp profile locally then pass to daemon
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 062d0b3921316bc348c7930ce6599e1f8f297090
Component: engine
2016-01-12 13:12:29 -08:00
David Calavera
98712ec16b Vendor engine-api 0.2.1.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ca60e6262bc33ce213e40bdebe9e64c4fb00974a
Component: engine
2016-01-12 13:19:16 -05:00
Sebastiaan van Stijn
e46c089f56 Merge pull request #18998 from calavera/syslog_tls
Allow syslog over TCP+TLS.
Upstream-commit: 656979670c5225753ad8d0c6d2bb1ab1a82b0b56
Component: engine
2016-01-11 17:21:38 -08:00
Arnaud Porterie
46b5818462 Merge pull request #18785 from aaronlehmann/new-manifest
New image manifest format
Upstream-commit: f11b6a2ab313a03d051dd6f69d264d0482df72d6
Component: engine
2016-01-11 12:01:46 -08:00
Arnaud Porterie
7e3ab3dcd7 Merge pull request #19198 from sanimej/vin
Vendoring libnetwork
Upstream-commit: fe3d1f9dd7f2c888ad69034464cba6a35a56018f
Component: engine
2016-01-10 11:46:34 -08:00
Aaron Lehmann
75cd536d3d Vendor updated github.com/docker/distribution
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 290ba41c00488b8c4ac2e5488bc1b040b758df75
Component: engine
2016-01-08 17:24:20 -08:00
cyli
03dfb7ff42 Re-vendoring notary in order to deal with a canonical JSON serialization issue.
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 5719b136dec7b2c3e76059cf9226a1b388a772f6
Component: engine
2016-01-08 16:45:15 -08:00
Santhosh Manohar
d53ca527b3 Vendoring libnetwork and its dependencies..
- replace /etc/hosts based name resolution with embedded DNS for user
  defined networks
- overlay veth cleanup: docker/docker#18814
- check before programming ipv6 in bridge: docker/docker#19139
- diable DAD: docker/docker#18871

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 8ccf5cffa7cd3cfd8e83fdaebc60a9f3d2473bcc
Component: engine
2016-01-08 14:13:21 -08:00
Arnaud Porterie
783f31c7b2 Merge pull request #19001 from aboch/pip
Allow user to choose the IP address for the container
Upstream-commit: 05de2aadff97be0ffe8a3ed0cf4ac363d291488f
Component: engine
2016-01-08 11:49:20 -08:00
Jess Frazelle
61116ea963 Merge pull request #18887 from riyazdf/notary-delegations
notary delegation integration into docker
Upstream-commit: 1c979f758753d921ced122dec3953ddbc35ee67f
Component: engine
2016-01-08 10:37:55 -08:00
David Calavera
219c1dc7e6 Vendor new syslog library with TLS support.
The syslog package in the stdlib is not maintained anymore.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 145f020122681d4868f717d64dfa556db22ac83d
Component: engine
2016-01-08 12:35:35 -05:00
Alessandro Boch
f1d228a431 Vendoring libnetwork
- 49c24217054e269aad3dbfd81ee32780b104dd84

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 19b063e740c8140c70bac65179f944422538babc
Component: engine
2016-01-08 09:19:31 -08:00
Riyaz Faizullabhoy
1ce594cbcd update tests and error messages, revendor notary with tag
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c32a66877f2ddc3f1cce66d78c69e032d6cf795
Component: engine
2016-01-08 09:11:33 -08:00
Riyaz Faizullabhoy
b741751f8d Notary delegation integration into docker
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: 1c125f50cfce422b19a15e84c5a3940890fb2e23
Component: engine
2016-01-07 19:35:45 -08:00
David Calavera
14985d55be Vendor engine-api 0.1.3.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1feeecf6e58c3690347efed9c0712a698ff426f0
Component: engine
2016-01-07 21:02:19 -05:00
David Calavera
e49de6ef58 Vendor engine-api project.
Use latest tag for both, engine-api and go-connections.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9927e712c0c5a04c2d802e160e27d3c16c650cf2
Component: engine
2016-01-06 19:46:06 -05:00
Srini Brahmaroutu
4da63ae80d update runc to the latest code base to fix gccgo build
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 998263170750ee5504bc4fe23f9a3d1f797e2a41
Component: engine
2016-01-06 00:02:56 +00:00
Sebastiaan van Stijn
3dd9453e30 Merge pull request #18775 from mrjana/mh
libnetwork vendoring
Upstream-commit: d4270c1764bbebb2eaaafc86837970b62699865e
Component: engine
2015-12-26 11:42:55 +01:00
Daniel Nephin
889a0e3758 Upgrade go-units vendor to latest version with ulimits.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3b8301b6600855e348bf4eeacabe5059f52e9d99
Component: engine
2015-12-23 13:27:58 -05:00
Daniel Nephin
85924c9d77 Upgrade vendored github.com/docker/go-connections to latest version, which includes new nat parse functions.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: fcc24995e0a4ad99c1a6dc445a8c6ff94df55c7c
Component: engine
2015-12-22 18:59:47 -05:00
Jana Radhakrishnan
663db95ac5 libnetwork vendoring
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436

Brings in:
    * Support for overlay network driver in 3.10+ kernels
    * Freebsd compilation fixes
    * Remove .dockerinit dependency
    * IPAM driver capability support
    * Network internal mode support
    * Misc. fixes

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: f0904affd127ea8bdebfc3f3c586f8eb38e91da5
Component: engine
2015-12-22 13:32:17 -08:00
David Calavera
d6be4062df Vendor new connections library.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ad7fa0110206de6ff53825afb17cb8bbf181785d
Component: engine
2015-12-22 13:31:46 -05:00
Alexander Morozov
5fc03c3956 Merge pull request #18719 from jfrazelle/vendor-updates
update and run vendor script
Upstream-commit: f8140332c0ea83a0821550452ed0aa26e2df3b3b
Component: engine
2015-12-16 11:27:02 -08:00
Jessica Frazelle
a9f65cbbd3 update and run vendor script
so there was weird whitespacing that got messed up the last time this was run, this fixes that and cleans up vendor helpers as well :)

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: a016ec6fd168016d94d6cfd1e2189f8c25f6de1f
Component: engine
2015-12-16 09:58:20 -08:00
David Calavera
0e29e152da Vendor go-units and libcontainer.
Libcontainer depends on the new package now to avoid cycled
dependencies.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0609342d04e3e5fbcf17f36c5affef5073643636
Component: engine
2015-12-16 12:25:54 -05:00
Alexander Morozov
19f8a4f8fb Merge pull request #18486 from aboch/vnd
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Upstream-commit: 260cbb19c93ba1dc5aa0f4065cd5c95241bbd59d
Component: engine
2015-12-14 13:32:01 -08:00
Mrunal Patel
fbb93e6251 Update runc/libcontainer to v0.0.6
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: e8f7d5885dad5364b25a8f1efa8bb6b29afa89b1
Component: engine
2015-12-11 15:24:32 -05:00
Alessandro Boch
3bcd3dfc58 Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 8fe6b3835c87abf0c48d60f9c1f70bdcb496566c
Component: engine
2015-12-09 13:48:24 -08:00
Jess Frazelle
ab6c9709f6 Merge pull request #17989 from jfrazelle/initial-seccomp-support
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
Jessica Frazelle
58deeedf40 update hack/vendor.sh scripts and run vendor
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ed5853de40b5e5c5df070a1f90f1fdde3ac56b20
Component: engine
2015-12-03 16:30:48 -08:00
Tonis Tiigi
d286ab94c3 vendor: bump distribution to 568bf038af6d65b376165d02886b1c7fcaef1f61
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 53cd579b6e4617bc13ad0f6e43a74dba9d0a8bb2
Component: engine
2015-12-03 13:36:31 -08:00
Vincent Batts
d4bbe1cfa0 vendor: update tar-split to v0.9.11
For optimizations.
https://github.com/docker/docker/issues/18370#issuecomment-161399901

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 919104e6bb19b2e815236ee5cffa919c373f85e2
Component: engine
2015-12-02 15:34:12 -05:00
Antonio Murdaca
c93754a0f9 vendor: bump deps
bump runc/libcontainer to v0.0.5
bump runc deps to latest
bump docker/libnetwork to 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 65900d7603368f045c904d178fab05a13c44a066
Component: engine
2015-11-26 16:29:59 +01:00
Sebastiaan van Stijn
d55f3e0dd1 revert README changes in vendored files
PR https://github.com/docker/docker/pull/17986
inadvertently included changes to some vendored files.

This reverts those changes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dd3634b3c1926cac2b714be4e7b5be49dfc0d0f2
Component: engine
2015-11-25 16:07:43 +01:00
Madhu Venugopal
cc6e53230d Fixed an endpoint delete issue with a possible stale sbox
Stale sandbox could be a result of stress tests on ungraceful
restarts such as #17984

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 423b55c4b4aaaa55188b3aeca2b6b2005b19e7ea
Component: engine
2015-11-19 12:46:37 -08:00
Luca-Bogdan Grigorescu
2052e6ad6a Fix small typos in documentation files
Signed-off-by: Luca-Bogdan Grigorescu <bogdan@gmail.com>
Upstream-commit: d1e72baa15fb81a6dcf80e6727b884fc8ff67335
Component: engine
2015-11-15 00:53:27 +02:00
Arnaud Porterie
2b045a190b Merge pull request #17937 from diogomonica/notary-pkcs11-client-integration
New version of notary with pkcs11 client integration
Upstream-commit: 7a6f2cdeeb88f340649a459697f79548759767dd
Component: engine
2015-11-14 12:03:29 +01:00
Antonio Murdaca
0179308537 Merge pull request #17211 from endocode/kayrus/docker_fd_https
Added possibility to use TLS with systemd socket activation
Upstream-commit: dc136b710b70a51510726576761f7bf9aa2455e2
Component: engine
2015-11-14 08:36:54 +01:00
Jessica Frazelle
e326b386f5 update notary vendors
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: a52a7a6991427f7f1db63755bf5a1cc09b105bd5
Component: engine
2015-11-13 13:19:09 -08:00
Alessandro Boch
789bc1f38f Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 43b3b6ecb4f838023478c484d32957386b7dd666
Component: engine
2015-11-10 21:13:25 -08:00
Tibor Vass
320a0d9081 Merge pull request #17853 from aboch/ipr
Fix fixed-cidr daemon option
Upstream-commit: 09980ef7ac2510cc67e160657f0829a47f5b5b28
Component: engine
2015-11-10 23:38:33 -05:00