docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-19 21:41:31 +03:00
Code Activity
32,958 Commits 12 Branches 297 Tags
9787d41c94338ecaebaa8ca7b42b84cb99a3aa3d
Commit Graph

5220 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
400dd10c7d Merge pull request #33809 from Microsoft/jjh/svmdedicatedscratch 
LCOW: Dedicated scratch space for service VM utilities
Upstream-commit: 8b29ba59ccdd4de45fa25137ec5d5a3845f5f5cc
Component: engine
 2017-06-28 11:06:46 -07:00
John Howard
08b4e324e5 Merge pull request #33826 from Microsoft/jjh/lcownits 
LCOW: Fix nits from 33241
Upstream-commit: 950d472c9ce4180b80e28030f7de68ffc3254f97
Component: engine
 2017-06-27 22:56:38 -07:00
Sebastiaan van Stijn
674cb1c136 Merge pull request #32977 from imkin/30491-default-container-size 
Add overlay2.size daemon storage-opt
Upstream-commit: acf855bf10e16b4282cb14f6cc34e378831a22c8
Component: engine
 2017-06-27 20:00:02 -07:00
John Howard
9a5747b3f9 LCOW: Fix nits from 33241 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4ec9766a27ffb964cec6b8b2745725965b2644aa
Component: engine
 2017-06-27 11:59:49 -07:00
John Howard
92d764e7fb LCOW: Dedicated scratch space for global service VM 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d1d649c891c8b06567afba7542ea9bf518cdaa02
Component: engine
 2017-06-27 10:55:16 -07:00
Brian Goff
59255c95cd Merge pull request #33832 from glasser/glasser/msg-source 
Fix stderr logging for journald and syslog
Upstream-commit: 7843bfde36d9ded6fada32f469fe1790316137ae
Component: engine
 2017-06-27 13:30:41 -04:00
Dhawal Yogesh Bhanushali
359031100e Add overlay2.size daemon storage-opt 
This commit adds the overlay2.size option to the daemon daemon
storage opts.

The user can override this option by the "docker run --storage-opt"
options.

Signed-off-by: Dhawal Yogesh Bhanushali <dbhanushali@vmware.com>
Upstream-commit: a63d5bc03513755015827d0fe93563240429f1e0
Component: engine
 2017-06-27 01:07:48 -07:00
John Stephens
e2c85453e0 Merge pull request #33815 from jstarks/lcow_command_args 
LCOW: pass command arguments without extra quoting
Upstream-commit: bcc8b2bc474ef2536bd4bac93a7b94935efaf57a
Component: engine
 2017-06-26 21:46:29 -07:00
Sebastiaan van Stijn
442b559ba0 Merge pull request #31497 from dnephin/engine-local-image-data 
Add a LastTagTime for images
Upstream-commit: 8f3c526e7851e047f5dde31bd2ce69f960e1d115
Component: engine
 2017-06-26 18:51:09 -07:00
Aaron Lehmann
525974b970 Merge pull request #33781 from mlaventure/fix-healhcheck-goroutine-leak 
Prevent a goroutine leak when healthcheck gets stopped
Upstream-commit: da28210a157a3bf5662f1a049bb10f9b69d2a5a2
Component: engine
 2017-06-26 15:34:43 -07:00
David Glasser
29123f2ea7 Fix stderr logging for journald and syslog 
logger.PutMessage, added in #28762 (v17.04.0-ce), clears msg.Source. So journald
and syslog were treating stderr messages as if they were stdout.

Signed-off-by: David Glasser <glasser@davidglasser.net>
Upstream-commit: 917050c5728f2fb9958ccb3ab66a23766f741adc
Component: engine
 2017-06-26 14:37:43 -07:00
Daniel Nephin
f5f8240661 Set a LastUpdated time in image metadata when an image tag is updated. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 016eea004ba0109d7cd965eab242ed17e4f0f36c
Component: engine
 2017-06-26 12:16:26 -07:00
John Starks
a08baae726 LCOW: pass command arguments without extra quoting 
Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 19645521a92869be7210fb663ed5e0e82e329ca5
Component: engine
 2017-06-24 10:23:17 -07:00
Sebastiaan van Stijn
8065c10b0c Merge pull request #33698 from cpuguy83/dm_deferred_delete_default 
Enable dm deferred_* with version check
Upstream-commit: 5b54e78947a5ab8b4c9e60179b205a82227944e4
Component: engine
 2017-06-23 19:30:05 -07:00
Aaron Lehmann
5b78ab86a3 Merge pull request #31273 from fabiokung/consistent-ro-view 
No container locks on `docker ps`
Upstream-commit: 56ad9bb1b4f7463cf1d6eab8b6f924f46ff2c2fe
Component: engine
 2017-06-23 15:28:55 -07:00
Kenfe-Mickael Laventure
2c8425881b Prevent a goroutine leak when healthcheck gets stopped 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 67297ba0051d39be544009ba76abea14bc0be8a4
Component: engine
 2017-06-23 08:06:49 -07:00
Fabio Kung
55b5e8b06f Net operations already hold locks to containers 
Fix a deadlock caused by re-entrant locks on container objects.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 37addf0a50ccba51630368c6ed09eb08166d6f48
Component: engine
 2017-06-23 07:52:35 -07:00
Fabio Kung
cd24ef2d4a avoid saving container state to disk before daemon.Register 
Migrate legacy volumes (Daemon.verifyVolumesInfo) before containers are
registered on the Daemon, so state on disk is not overwritten and legacy
fields lost during registration.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 76d96418b13080514f3fb861072b06cb91d71cff
Component: engine
 2017-06-23 07:52:34 -07:00
Fabio Kung
60fed1f9a7 delete unused code (daemon.Start) 
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 66b231d598174986ad08236f0a38beb825e5a3c3
Component: engine
 2017-06-23 07:52:34 -07:00
Fabio Kung
69f8ddc123 ensure heath monitor status updates are propagated 
initHealthMonitor and updateHealthMonitor can cause container state to
be changed (State.Health).

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 04bd768a889f94a4dc6ad25e2a014dffd0a4e04e
Component: engine
 2017-06-23 07:52:34 -07:00
Fabio Kung
9755d1918d avoid re-reading json files when copying containers 
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: a43be3431e51b914ab170569b9e58239d64b199c
Component: engine
 2017-06-23 07:52:34 -07:00
Fabio Kung
b8affe908f only Daemon.load needs to call label.ReserveLabel 
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 9134e87afc6f3215a58d23c7261242b764357501
Component: engine
 2017-06-23 07:52:33 -07:00
Fabio Kung
940ce3d71d save deep copies of Container in the replica store 
Reuse existing structures and rely on json serialization to deep copy
Container objects.

Also consolidate all "save" operations on container.CheckpointTo, which
now both saves a serialized json to disk, and replicates state to the
ACID in-memory store.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: edad52707c536116363031002e6633e3fec16af5
Component: engine
 2017-06-23 07:52:33 -07:00
Fabio Kung
debc6bf90d verifyVolumesInfo needs a container lock 
It operates on containers that have already been registered on the
daemon, and are visible to other goroutines.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 201a37f7a110402a76ac1ee21b5d09ccffed2acb
Component: engine
 2017-06-23 07:52:33 -07:00
Fabio Kung
a2b99b3d6c no need to save state to disk here 
State will be saved on the following operation once the container is
properly registered on the daemon.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 03aa24721c88e508f208c1ff72d8cd1af7e6a0f8
Component: engine
 2017-06-23 07:52:32 -07:00
Fabio Kung
ae145558ae Move checkpointing to the Container object 
Also hide ViewDB behind an inteface.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: aacddda89df05b88a6d15fb33c42864760385ab2
Component: engine
 2017-06-23 07:52:32 -07:00
Fabio Kung
8111997a67 stop grabbing container locks during ps 
Container queries are now served from the consistent in-memory db, and
don't need to grab a lock on every container being listed.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 8e425ebc422876ddf2ffb3beaa5a0443a6097e46
Component: engine
 2017-06-23 07:52:31 -07:00
Fabio Kung
8889d56b70 keep a consistent view of containers rendered 
Replicate relevant mutations to the in-memory ACID store. Readers will
then be able to query container state without locking.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: eed4c7b73f0cf98cf48943da1c082f3210b28c82
Component: engine
 2017-06-23 07:52:31 -07:00
Fabio Kung
8cedd0fee9 Move platform specific mount data to Container 
The Solaris version (previously daemon/inspect_solaris.go) was
apparently missing some fields that should be available on that
platform.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: cfc404a375817125e4b32a9cd6a4ec7e3c55dc4e
Component: engine
 2017-06-23 07:22:47 -07:00
Sebastiaan van Stijn
f565ab7c75 Merge pull request #33773 from aaronlehmann/vendor-swarmkit-79381d0 
Vendor swarmkit 79381d0
Upstream-commit: 4d0c01ac17933ee0c8b94bc2beea5965377d42ef
Component: engine
 2017-06-22 16:26:34 -07:00
Fabio Kung
33086f32cd Grab a lock to read container.RemovalInProgress 
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 481a92cb4111ebc1b7d4de5eeff84f570e4ba5dd
Component: engine
 2017-06-21 19:11:23 -07:00
John Stephens
ad62bca460 Merge pull request #33241 from Microsoft/jjh/multi-layerstore 
LCOW: Support most operations excluding remote filesystem
Upstream-commit: 930e6896685f614d8f15ed10207596b1a151cbc8
Component: engine
 2017-06-21 15:45:23 -07:00
Aaron Lehmann
61e4b54502 Vendor swarmkit 79381d0 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 79b940feee9cf18893ead7269cfd59ec41bd7297
Component: engine
 2017-06-21 15:32:53 -07:00
Sebastiaan van Stijn
f7df2b4669 Merge pull request #33735 from tonistiigi/force-pull-fix 
builder: fix copy —from conflict with force pull
Upstream-commit: 795a2fdbcb31fdc80ed5bb1fc8bf01e44b1a961d
Component: engine
 2017-06-21 12:07:54 -07:00
John Howard
5115d455e7 LCOW: Rework after 33454 merged which refactored daemon/builder interface 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3a09b56a10960fb740182d2a12e907f2e80b54c8
Component: engine
 2017-06-20 19:50:13 -07:00
John Howard
420a8c950f LCOW: Coherency - ensure windowsfilter driver is not used 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: bdabc76a5336322de505f8ec7dd3e0959c5919a8
Component: engine
 2017-06-20 19:50:13 -07:00
John Howard
30ae68b1d5 LCOW: Don't mount for linux containers either 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f8aa70055ef59e73f3c52fc028a0ad3c1634e697
Component: engine
 2017-06-20 19:50:12 -07:00
John Howard
01b491fce5 LCOW: Create layer folders with correct ACL 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ed10ac6ee93cf5c389a735c0c97b08d5d5dff3a9
Component: engine
 2017-06-20 19:50:12 -07:00
John Howard
94ce604e3d LCOW: OCI Spec and Environment for container start 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f1545882264e743fa6d6859ee8687407e28fc35c
Component: engine
 2017-06-20 19:50:11 -07:00
John Howard
9541d17c29 LCOW: Plumb through platform on Import 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3d5cec70b4432866e4c290e9fc601571ca09da9d
Component: engine
 2017-06-20 19:49:54 -07:00
John Howard
6ced3cca3f LCOW: Push to switch platform 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a97b99e2d801ed1ec4c77387dd7b47631697c25f
Component: engine
 2017-06-20 19:49:54 -07:00
John Howard
eb420d5366 LCOW: Image exporter update 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e05cedcbf9efcfe864574dea054a71665cf089b6
Component: engine
 2017-06-20 19:49:54 -07:00
John Howard
ebc74326cd LCOW: Fix ImageCache to address right store 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ba40132366e196c740cdf2d2f1cbee7ead955d2f
Component: engine
 2017-06-20 19:49:53 -07:00
John Howard
30a1a8646e LCOW: Store integrity checks 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 87abf34a3d7bb63e3948eb1d801ac43b379d779e
Component: engine
 2017-06-20 19:49:53 -07:00
John Howard
2665467b29 LCOW: Builder plumbing 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 08252bc963a20b2fb3052fc8db7143771c8c3248
Component: engine
 2017-06-20 19:49:53 -07:00
John Howard
094f300460 LCOW: pull goes to correct stores 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a1fe1dc791633998bcc82b5f0734a5da68d2bb41
Component: engine
 2017-06-20 19:49:52 -07:00
John Howard
0e82890827 LCOW: commit to use image platform, not host 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8f5378069444fba89e43b95e95d5ac630b33d90b
Component: engine
 2017-06-20 19:49:52 -07:00
John Howard
3af9801344 LCOW: Move daemon stores to per platform 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3aa4a0071536d3b106374eaa44d8a55765901aa6
Component: engine
 2017-06-20 19:49:52 -07:00
John Howard
5ce127c469 LCOW: Add platform to image store 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6c336849876c2117381618b577f1b24f1fb85571
Component: engine
 2017-06-20 19:49:51 -07:00
John Howard
97b623b9f6 LCOW: Graphdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>

Adds the graphdriver for Linux containers on Windows
Upstream-commit: ed4d2aa981a9057766a9cec53c3bd19be4eef059
Component: engine
 2017-06-20 19:49:24 -07:00