Commit Graph

31023 Commits

Author SHA1 Message Date
aaa2288536 Merge pull request #33798 from vdemeester/move-some-api-code-away
Move some `api` package functions away
Upstream-commit: d311a3a681f918906249a1678eab0136ac663f6e
Component: engine
2017-06-24 14:30:25 +02:00
d532fc19ff Merge pull request #33812 from thaJeztah/cleanup-gitignore
Cleanup gitignore
Upstream-commit: 5e2004c1b9e1cab4b2ac3ba7c8edfd959a67c836
Component: engine
2017-06-24 01:34:40 -07:00
7efc650625 Merge pull request #33674 from raja-sami-10p/pkg/templates
Increase test Coverage of pkg/templates
Upstream-commit: 4964b092384a0e1c42b2db728aeeaf129a50f54f
Component: engine
2017-06-24 01:04:24 -07:00
ee1b2dfe8c Merge pull request #33467 from bschwind/copy-documentation
Add note to CopyToContainer documentation
Upstream-commit: 5564fad4068619e7d0c5fd7defe7dd5e3f0edd8c
Component: engine
2017-06-24 00:19:51 -07:00
ea9175efe5 Cleanup gitignore
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a7b24296c8ad7928ba56a4c2ecd675a34934177d
Component: engine
2017-06-23 23:04:39 -07:00
c842c1cbcc Merge pull request #33801 from albers/completion-dev-environment
Add bash completion to the development container
Upstream-commit: 94e9cb13f436509e0c64a17df16b4e9cad536704
Component: engine
2017-06-23 22:52:14 -07:00
c080f953a4 Merge pull request #33719 from dnephin/warn-on-empty-continuation-carry
[Builder] Warn on empty continuation lines
Upstream-commit: 8d1ae76dcbbb73d8e20c6a14a7d3fe2410b95f55
Component: engine
2017-06-23 22:52:02 -07:00
8e27989c88 Merge pull request #33707 from Syntaxide/s3fix
Fix authorization header handling in downloader script.
Upstream-commit: d75eb735eee26521b76c732f8b07cfaf6c460d12
Component: engine
2017-06-23 20:27:54 -07:00
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
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
7a0490e85b Merge pull request #33804 from clnperez/fix-cli-test-autogen
Fix autogen vars
Upstream-commit: 6e96eec565664a261fd641a6807c3c5e17ffefff
Component: engine
2017-06-23 15:28:29 -07:00
553c4b8a9b Merge pull request #33785 from Microsoft/jjh/hcsschemaupdate
LCOW: Updates necessary due to platform schema change
Upstream-commit: 25a65a185b6b512117803ab25c716ca8f831ccdf
Component: engine
2017-06-23 13:08:13 -07:00
34f4d1d4f0 Fix autogen vars
commit ea2e4d73c4c753cdc99966e4dfe35143e79564ce removed the autogen
script, but if you happen to clone the dir fresh from git, you can't
build the integration test binaries.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 091e07c87d7dc9130e4f9b0f68342bb07c79ba2f
Component: engine
2017-06-23 14:40:09 -05:00
cbfdedc6bd Move some api package functions away
- DisplayablePorts is a `cli` function, moving to `docker/cli`
- Move MatchesContentType to the only package using it,
  `api/server/httputils` (and remove the deps on logrus for `api` package)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 565aa41392b01251dfc9398eb69c23bdd8ea64e6
Component: engine
2017-06-23 19:37:26 +02:00
0a2d82735e Add a test for warning on empty continuation lines.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b47b375cb8bb0dca7ee0ebfa093bfc163ad867fb
Component: engine
2017-06-23 13:15:04 -04:00
78a82a7623 Warn/deprecate continuing on empty lines in Dockerfile
This fix is related to 29005 and 24693. Currently in `Dockerfile`
empty lines will continue as long as there is line escape before.
This may cause some issues. The issue in 24693 is an example.
A non-empty line after an empty line might be considered to be a
separate instruction by many users. However, it is actually part
of the last instruction under the current `Dockerfile` parsing
rule.

This fix is an effort to reduce the confusion around the parsing
of `Dockerfile`. Even though this fix does not change the behavior
of the `Dockerfile` parsing, it tries to deprecate the empty line
continuation and present a warning for the user. In this case,
at least it prompt users to check for the Dockerfile and avoid
the confusion if possible.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7815c8f8754d5473eda7cd80277a4ea3c59e3c29
Component: engine
2017-06-23 13:04:40 -04:00
d2f6c7daee Add bash completion to the development container
Adds an environment variable `DOCKER_BASH_COMPLETION_PATH` that allows to
include a bash completion script into the development container.

This is needid for development of bash completion.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e2c424a7f32945a47e271cb804b091c83429912
Component: engine
2017-06-23 18:11:55 +02:00
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
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
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
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
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
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
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
666b1f6a5b no need to save container state here
it is already being saved (with a lock held) on the subsequent
operations.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: f668af4475980e32c99503c4a513668c24ea2da6
Component: engine
2017-06-23 07:52:33 -07:00
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
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
84bdea3f4f how to maintain the container snapshot struct
Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 2ed6f9257a0ccb81583e65bf8af0e00f8e2dedcb
Component: engine
2017-06-23 07:52:32 -07:00
9bf8a3a581 Make tests a bit less flaky
Prevent tests failing when teardown tries to delete a container that is
already being removed.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: fcb6d37a8dde8a91896116742116e9d9808b18ac
Component: engine
2017-06-23 07:52:32 -07:00
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
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
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
ad08f8c7af in-memory ACID store for containers
This can be used by readers/queries so they don't need locks.

Signed-off-by: Fabio Kung <fabio.kung@gmail.com>
Upstream-commit: 054728b1f555892c6c0bfd7abfbaeb2fedbc8f10
Component: engine
2017-06-23 07:24:11 -07:00
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
9a5b3d1ecf Increase test Coverage of pkg/templates
Signed-off-by: Raja Sami <raja.sami@tenpearls.com>
Upstream-commit: 27e771b714b599c449c8fb8f01547454912aeb28
Component: engine
2017-06-23 12:38:33 +05:00
f3a5ac7e36 Merge pull request #33653 from raja-sami-10p/pkg/streamformatter
Increase the Coverage of pkg/streamformatter
Upstream-commit: db57b85fcbe01ab195b48da3d715fdb4e1d4f9e8
Component: engine
2017-06-22 19:52:02 -07:00
38ce10a9ac Vendor jhowardmsft/opengcs v0.0.4
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c75db46d5b4faae326793b7c6c5fc35be39fca7d
Component: engine
2017-06-22 19:28:49 -07:00
35bda9cb09 Vendor Microsoft/hcsshim v0.5.25
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9508c605d882a5981a480ab0a07cc9b77568b4d8
Component: engine
2017-06-22 19:28:43 -07:00
e63e0a4f81 Merge pull request #33786 from thaJeztah/interactive-build-sessions
Documentation updates for interactive sessions
Upstream-commit: 2ef8936d8e060fa071e8d1422f9260e63c55f737
Component: engine
2017-06-22 18:11:52 -07:00
1ff0d7b31f Merge pull request #33738 from fcrisciani/libnetwork-vendoring
Libnetwork vendoring
Upstream-commit: 9f5f3e49dae981736b37bf3d18592c2ce4029644
Component: engine
2017-06-22 17:41:46 -07:00
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
ae62a09f9b Update "download-frozen-image-v2.sh" such that redirects are optional
If the registry responds directly with blob contents, use them,
otherwise follow the redirect without Authorization headers (which
likely aren't valid for the server being redirected to).

This preserves the basic structure of the previous output with up to one
additional progress bar per-layer (for the redirect request and then the
following blob request).

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
Upstream-commit: 4bbdc0b8f7b2faa3354738c300cfedb2b77c7316
Component: engine
2017-06-22 15:54:50 -07:00
862be7247c Update downloader script, to ensure that Authorization header is not passed when downloading blobs.
Signed-off-by: Alexander Midlash <amidlash@docker.com>
Upstream-commit: 5c38e4c16a0a51a0cffb4802ecc694e5f5bfbeed
Component: engine
2017-06-22 15:54:50 -07:00
3821f2cd57 Documentation updates for interactive sessions
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b8b8a9c837889c8851aade242ab1a1be0a8e7cf4
Component: engine
2017-06-22 15:36:56 -07:00
c54a797733 LCOW: Update for platforms latest schema
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 330913cadf1fcca00be4b6b841ceb8d14471f470
Component: engine
2017-06-22 14:07:23 -07:00
908bb4d956 Improve routes initialization
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8f68adfaf0231ded0ba6bd2ec522711752031885
Component: engine
2017-06-22 11:52:43 -07:00
e529bcd027 Implement incremental file sync using client session
Also exposes shared cache and garbage collection/prune
for the source data.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5c3d2d552b0430672d5f481ab2d37036f6e92166
Component: engine
2017-06-22 11:52:35 -07:00
0051caf8c8 vendor: update deps for fssession
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7cfcf74a907bb1fce63e95761c7e1ac70cb9e5df
Component: engine
2017-06-22 11:22:42 -07:00
6553b6419b session: update swagger yaml
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4f51ca1e825072d89762a1a5273e714196910d90
Component: engine
2017-06-22 11:22:42 -07:00
b1e4d7d884 Add long-running client session endpoint
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ec7b6238c31e26702ecf366731532e189b5da142
Component: engine
2017-06-22 11:22:41 -07:00