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
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
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
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
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
bfc36e79fd
Merge pull request #33764 from keloyang/fix-queue-mem-leak
...
Fix mem leak in libcontainerd/queue/append
Upstream-commit: f88626b270827da7e8a2d668dc2e16bbe1ac53f0
Component: engine
2017-06-22 10:57:07 -07:00
e48afa3455
Merge pull request #33774 from Microsoft/jjh/lcow-networking
...
LCOW: owner and network endpoints
Upstream-commit: c85f92de15d8f7162b7579143d2be74d8453996d
Component: engine
2017-06-22 16:40:50 +02:00
7ccd764533
fix mem leak in libcontainerd/queue/append
...
Signed-off-by: yangshukui <yangshukui@huawei.com >
Upstream-commit: 5425a5ab842894d7eb7e26bb706a04be40b67075
Component: engine
2017-06-22 16:47:47 +08:00
926eab07b2
Merge pull request #33772 from cpuguy83/optimizations
...
Don't json marshal then immediately unmarshal
Upstream-commit: 4fc2710dc7a8fc87849e94770fcf33eececae2fc
Component: engine
2017-06-22 01:19:08 -07:00
8aabb3651f
Increase the Coverage of pkg/streamformatter
...
Signed-off-by: Raja Sami <raja.sami@tenpearls.com >
Upstream-commit: 956c5b61cea9e476847b9d2231ac66d3ec85f018
Component: engine
2017-06-22 12:29:10 +05:00
ce27333614
Merge pull request #33776 from thaJeztah/remove-deprecated-mkimage
...
Remove deprecated contrib/mkimage-xyz scripts
Upstream-commit: 5f0062f0fa97adc480f2e15b20efb89f5cbe3b5b
Component: engine
2017-06-21 22:41:48 -07:00
40224fcf4b
LCOW: owner and network endpoints
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e99a633720563d8d8d2669791cee542c0f989291
Component: engine
2017-06-21 22:35:30 -07:00
02a0e27cd2
Remove deprecated contrib/mkimage-xyz scripts
...
The contrib/mkimage-busybox.sh, contrib/mkimage-debootstrap.sh,
and contrib/mkimage-rinse.sh were deprecated in commit
51f707cf9dfb2dbe31cfd0cd92b922ca5d98e842, in favor of
their equivalents in contrib/mkimage/
Given that the deprecation warning has been in place
for over three years, it's save to now remove these.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d14fb3ac4e712e5927eaad33213b0910aa56ec13
Component: engine
2017-06-21 21:56:24 -07:00
0ae69f3fe0
Merge pull request #33750 from dnephin/cleanup-more-cli-leftovers
...
Cleanup more cli leftovers
Upstream-commit: 4bdb6ed9b58d641176a601cfe92d496038c5a557
Component: engine
2017-06-21 21:23:28 -07:00
2182fa2720
Merge pull request #32779 from rremer/auto-update-client
...
pull client API version negotiation out of the CLI and into the client
Upstream-commit: 8a672ba1aa5534a633b05fec7954afefd00b49f6
Component: engine
2017-06-21 17:35:22 -07:00
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
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
f9852d6a7a
Don't json marshal then immediately unmarshal
...
During container startup we end up spending a fair amount of time
encoding/decoding json.
This cuts out some of that since we already have the decoded object in
memory.
The old flow looked like:
1. Start container request
2. Create file
3. Encode container spec to json
4. Write to file
5. Close file
6. Open file
7. Read file
8. Decode container spec
9. Close file
10. Send to containerd.
The new flow cuts out steps 6-9 completely, and with it a lot of time
spent in reflect and file IO.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 8d588d9c5b5cd019e09bcfc4f790eae79405c7b1
Component: engine
2017-06-21 15:18:01 -07:00
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
4dc3e08e78
Merge pull request #33755 from aaronlehmann/imagestore-locking
...
image: Improve store locking
Upstream-commit: e64c2d7122158d7d8583ff6967c3e4a833042c25
Component: engine
2017-06-21 10:01:19 -07:00
3cdf042bf3
Remove yaml docs generator and man pages
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2b45ec7f786bc91d6db42bd33c13e28a06d30aa3
Component: engine
2017-06-21 11:20:05 -04:00
6dc61813df
Remove bindata
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 96e61f3173c21a94f06db2bf1f8a6041da3e4e21
Component: engine
2017-06-21 11:20:05 -04:00
628a1d1381
remove cli concerns from hack/make
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ea2e4d73c4c753cdc99966e4dfe35143e79564ce
Component: engine
2017-06-21 11:20:05 -04:00
e9c808203d
Remove miekg/pkcs11 from vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4e5293c253c4803de75c77cc9cee024d95303d6a
Component: engine
2017-06-21 11:18:44 -04:00
10a4963c2c
Remove pkcs11, libltdl-dev, and clang for osx.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b877fc31c51baaf1ec42501ab366dd05a5b6bb21
Component: engine
2017-06-21 11:18:44 -04:00
da0da46764
Merge pull request #33749 from Microsoft/jjh/cross
...
Show what cross-build is executing
Upstream-commit: be02125491bf0b4556b3f82377ae7ff9b88f336a
Component: engine
2017-06-21 17:17:10 +02:00
3738ce72e4
Merge pull request #33748 from cpuguy83/remove_osx_cross
...
Remove OSX cross stuff from main Dockerfile
Upstream-commit: 9823457ed5af653689a3eb59f43960138b5528f3
Component: engine
2017-06-21 14:14:09 +02:00
24b6b491fa
pull client API version negotiation out of the CLI and into the client
...
Signed-off-by: Royce Remer <royceremer@gmail.com >
Upstream-commit: 5f1d94e569592fc2680f8661e16d0e5b02e82492
Component: engine
2017-06-20 22:58:16 -07:00
1aa240e6dc
dockerfile: update docker-py
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: d183d6fa7d91307eb6ea68582697f3e1e5e5dfcd
Component: engine
2017-06-20 22:03:35 -07:00
429224cba5
LCOW: Set correct default shell for platform in builder
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fe7b4d8fcd737b9162540149acc427d51d1ddfb9
Component: engine
2017-06-20 19:54:33 -07:00
c06d3d8d0f
Show what cross-build is executing
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d82e26ae424b421a047aeb0f3c866e8fe49351d8
Component: engine
2017-06-20 19:50:14 -07:00
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
2c98e91710
LCOW: Fix schemav1 pull to extract platform
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b21d9ab5954b77222985fcbd326b1ef7ff7f6d64
Component: engine
2017-06-20 19:50:13 -07:00
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
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
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
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
3ad2759bd3
Vendor jhowardmsft/opengcs v0.0.3
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 07034a4420c9bd1cb964f18c0128a215ab17d5a8
Component: engine
2017-06-20 19:49:56 -07:00
1a43aff22a
Vendor Microsoft/hcsshim @ v0.5.2
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8fe9eb0551aa02eeacf1a27d5cf5adeb0c2bacac
Component: engine
2017-06-20 19:49:55 -07:00
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
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
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
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
