Vincent Demeester
ff4f700f74
Merge pull request #33322 from jsoref/spelling
...
Spelling
2017-07-04 15:46:34 +02:00
Brian Goff
c2ad549533
Merge pull request #33213 from gkze/master
...
GCP Logs: send log text as jsonPayload.message instead of jsonPayload.data
2017-07-03 16:18:18 -04:00
Josh Soref
39bcaee47b
Spelling fixes
...
* additional
* ambiguous
* anonymous
* anything
* application
* because
* before
* building
* capabilities
* circumstances
* commit
* committer
* compresses
* concatenated
* config
* container
* container's
* current
* definition
* delimiter
* disassociates
* discovery
* distributed
* doesnotexist
* downloads
* duplicates
* either
* enhancing
* enumerate
* escapable
* exactly
* expect
* expectations
* expected
* explicitly
* false
* filesystem
* following
* forbidden
* git with
* healthcheck
* ignore
* independent
* inheritance
* investigating
* irrelevant
* it
* logging
* looking
* membership
* mimic
* minimum
* modify
* mountpoint
* multiline
* notifier
* outputting
* outside
* overridden
* override
* parsable
* plugins
* precedence
* propagation
* provided
* provides
* registries
* repositories
* returning
* settings
* should
* signals
* someone
* something
* specifically
* successfully
* synchronize
* they've
* thinking
* uninitialized
* unintentionally
* unmarshaling
* unnamed
* unreferenced
* verify
Signed-off-by: Josh Soref <jsoref@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-03 13:13:09 -07:00
Victor Vieux
d061ad4a1b
Merge pull request #33926 from coolljt0725/fix_wrong_file_mode
...
Fix wrong filemode for rotate log files
2017-07-03 17:45:14 +02:00
Lei Jitang
96ea8eaa15
Fix wrong filemode for rotate log files
...
the filemode should be 0640 but not 06400
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-07-03 03:49:22 -04:00
Aaron Lehmann
d257a63fb6
daemon: Ignore nonexistent containers when listing containers
...
The name/ID relationships are maintained separately from the memdb and
can be out of sync from any particular memdb snapshot. If a container
does not exist in the memdb, we must accept this as normal and not fail
the listing. This is consistent with what the code used to do before
memdb was introduced.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-30 15:19:47 -07:00
Sebastiaan van Stijn
8b29ba59cc
Merge pull request #33809 from Microsoft/jjh/svmdedicatedscratch
...
LCOW: Dedicated scratch space for service VM utilities
2017-06-28 11:06:46 -07:00
John Howard
950d472c9c
Merge pull request #33826 from Microsoft/jjh/lcownits
...
LCOW: Fix nits from 33241
2017-06-27 22:56:38 -07:00
Sebastiaan van Stijn
acf855bf10
Merge pull request #32977 from imkin/30491-default-container-size
...
Add overlay2.size daemon storage-opt
2017-06-27 20:00:02 -07:00
John Howard
4ec9766a27
LCOW: Fix nits from 33241
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-27 11:59:49 -07:00
John Howard
d1d649c891
LCOW: Dedicated scratch space for global service VM
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-27 10:55:16 -07:00
Brian Goff
7843bfde36
Merge pull request #33832 from glasser/glasser/msg-source
...
Fix stderr logging for journald and syslog
2017-06-27 13:30:41 -04:00
Dhawal Yogesh Bhanushali
a63d5bc035
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>
2017-06-27 01:07:48 -07:00
John Stephens
bcc8b2bc47
Merge pull request #33815 from jstarks/lcow_command_args
...
LCOW: pass command arguments without extra quoting
2017-06-26 21:46:29 -07:00
Sebastiaan van Stijn
8f3c526e78
Merge pull request #31497 from dnephin/engine-local-image-data
...
Add a LastTagTime for images
2017-06-26 18:51:09 -07:00
Aaron Lehmann
da28210a15
Merge pull request #33781 from mlaventure/fix-healhcheck-goroutine-leak
...
Prevent a goroutine leak when healthcheck gets stopped
2017-06-26 15:34:43 -07:00
David Glasser
917050c572
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>
2017-06-26 14:37:43 -07:00
Daniel Nephin
016eea004b
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>
2017-06-26 12:16:26 -07:00
John Starks
19645521a9
LCOW: pass command arguments without extra quoting
...
Signed-off-by: John Starks <jostarks@microsoft.com>
2017-06-24 10:23:17 -07:00
Sebastiaan van Stijn
5b54e78947
Merge pull request #33698 from cpuguy83/dm_deferred_delete_default
...
Enable dm deferred_* with version check
2017-06-23 19:30:05 -07:00
Aaron Lehmann
56ad9bb1b4
Merge pull request #31273 from fabiokung/consistent-ro-view
...
No container locks on `docker ps`
2017-06-23 15:28:55 -07:00
Kenfe-Mickael Laventure
67297ba005
Prevent a goroutine leak when healthcheck gets stopped
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-06-23 08:06:49 -07:00
Fabio Kung
37addf0a50
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>
2017-06-23 07:52:35 -07:00
Fabio Kung
76d96418b1
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>
2017-06-23 07:52:34 -07:00
Fabio Kung
66b231d598
delete unused code (daemon.Start)
...
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
2017-06-23 07:52:34 -07:00
Fabio Kung
04bd768a88
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>
2017-06-23 07:52:34 -07:00
Fabio Kung
a43be3431e
avoid re-reading json files when copying containers
...
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
2017-06-23 07:52:34 -07:00
Fabio Kung
9134e87afc
only Daemon.load needs to call label.ReserveLabel
...
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
2017-06-23 07:52:33 -07:00
Fabio Kung
edad52707c
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>
2017-06-23 07:52:33 -07:00
Fabio Kung
201a37f7a1
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>
2017-06-23 07:52:33 -07:00
Fabio Kung
03aa24721c
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>
2017-06-23 07:52:32 -07:00
Fabio Kung
aacddda89d
Move checkpointing to the Container object
...
Also hide ViewDB behind an inteface.
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
2017-06-23 07:52:32 -07:00
Fabio Kung
8e425ebc42
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>
2017-06-23 07:52:31 -07:00
Fabio Kung
eed4c7b73f
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>
2017-06-23 07:52:31 -07:00
Fabio Kung
cfc404a375
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>
2017-06-23 07:22:47 -07:00
Sebastiaan van Stijn
4d0c01ac17
Merge pull request #33773 from aaronlehmann/vendor-swarmkit-79381d0
...
Vendor swarmkit 79381d0
2017-06-22 16:26:34 -07:00
Fabio Kung
481a92cb41
Grab a lock to read container.RemovalInProgress
...
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
2017-06-21 19:11:23 -07:00
John Stephens
930e689668
Merge pull request #33241 from Microsoft/jjh/multi-layerstore
...
LCOW: Support most operations excluding remote filesystem
2017-06-21 15:45:23 -07:00
Aaron Lehmann
79b940feee
Vendor swarmkit 79381d0
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-21 15:32:53 -07:00
Sebastiaan van Stijn
795a2fdbcb
Merge pull request #33735 from tonistiigi/force-pull-fix
...
builder: fix copy —from conflict with force pull
2017-06-21 12:07:54 -07:00
John Howard
3a09b56a10
LCOW: Rework after 33454 merged which refactored daemon/builder interface
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:50:13 -07:00
John Howard
bdabc76a53
LCOW: Coherency - ensure windowsfilter driver is not used
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:50:13 -07:00
John Howard
f8aa70055e
LCOW: Don't mount for linux containers either
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:50:12 -07:00
John Howard
ed10ac6ee9
LCOW: Create layer folders with correct ACL
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:50:12 -07:00
John Howard
f154588226
LCOW: OCI Spec and Environment for container start
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:50:11 -07:00
John Howard
3d5cec70b4
LCOW: Plumb through platform on Import
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:49:54 -07:00
John Howard
a97b99e2d8
LCOW: Push to switch platform
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:49:54 -07:00
John Howard
e05cedcbf9
LCOW: Image exporter update
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:49:54 -07:00
John Howard
ba40132366
LCOW: Fix ImageCache to address right store
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:49:53 -07:00
John Howard
87abf34a3d
LCOW: Store integrity checks
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 19:49:53 -07:00