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
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
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
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
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
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
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
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
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
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
767c3943b7
LCOW: Add platform to container, init on FromDisk()
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f97fbba5cec3d27099e230f7c1dc278c54180d74
Component: engine
2017-06-20 19:49:51 -07:00
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
60028ea97d
image: Improve store locking
...
This showed up in a recent profile.
Search doesn't need to take a lock on the store, because digestset has
its own locking.
Some other methods can get by with a read lock instead of an exclusive
lock.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 44e67adae5695e3e2c3b450453ab0fe6119eb80d
Component: engine
2017-06-20 18:31:29 -07:00
dee43e0b2b
Merge pull request #33694 from shakeme/master
...
Small fix and new option for contrib/mkimage_alpine.sh
Upstream-commit: 88bddd46d8ff0df7098624554bdc62deb2c84a7a
Component: engine
2017-06-20 17:00:30 -07:00
02b551dece
Merge pull request #33587 from bergwolf/aufs
...
fix aufs mount option length calculation
Upstream-commit: 226bf3e0d92511d20792b1dd1bf72fb3eb67b6a9
Component: engine
2017-06-20 15:51:42 -07:00
d3db128900
builder: fix copy —from conflict with force pull
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c268d9da4b658b2dd1fe48010a8929b603913e92
Component: engine
2017-06-20 15:45:33 -07:00
2a96330e2c
Merge pull request #33639 from thaJeztah/cleanup-TestServiceCreateCompatiblePlatforms
...
Make TestServiceCreateCompatiblePlatforms use actual API response
Upstream-commit: c621330ba928c85e8c576b0d89ecbf985f5bdf5c
Component: engine
2017-06-20 13:57:06 -07:00
6220fae10d
Merge pull request #33097 from stevvooe/remove-random-pkg
...
pkg: remove random package
Upstream-commit: b5f68d7ed3a2a9db7bdbfd3bdee42d9d1a7e5423
Component: engine
2017-06-20 13:43:38 -07:00
56c93a237b
Show what cross-build is executing
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cdc39033effc940eda23854d3b5afbf706a8d17a
Component: engine
2017-06-20 13:30:51 -07:00
3814817472
Remove OSX cross stuff from main Dockerfile
...
This is no longer needed here. It was required for compiling the CLI
which we no longer do here.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 57f0e0c61982269093eb6d9934656ea70b573938
Component: engine
2017-06-20 13:06:37 -07:00
7ded95d08c
LCOW: Deprecate storagedriver option
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 01e597ca4351b83e32346c32ad510f03b0b3b95b
Component: engine
2017-06-20 09:21:37 -07:00
8508f49b3f
LCOW: Pass platform through into layer store
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 42c5c1a9ec14f00d5a5367131493cbd6de7d72b0
Component: engine
2017-06-20 09:21:37 -07:00
04857f417d
LCOW: Adds platform to the layer store
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fc21bf280bac39377d3a236efa87f5c8cbadfb9f
Component: engine
2017-06-20 09:00:32 -07:00
dd6f4eb487
LCOW: Remove CommonContainer - just Container
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 55f8828eec1ff6c70628a0b6f22bea175ce36159
Component: engine
2017-06-20 08:55:46 -07:00
cad0e361c3
LCOW: Add environment variable to enable
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fe5b34ba8828dc2f2f7db180a102cee360fec6e0
Component: engine
2017-06-20 08:55:46 -07:00
8c7c972d20
Merge pull request #33454 from dnephin/refactor-builder-remove-copy-on-build
...
[Builder] Move file coping from the daemon to the builder
Upstream-commit: 99c72eb2682c0539ad3cc544eb28876af78b33a1
Component: engine
2017-06-20 10:12:57 +02:00
077c312216
Merge pull request #33725 from ripcurld0/deprecate_go16
...
Remove Go 1.6 code from moby
Upstream-commit: 93c06b801334713f88e92838f67cf322e6eb808b
Component: engine
2017-06-20 08:54:01 +03:00
0a8fc1d6f6
Merge pull request #33522 from naveed-jamil-tenpearls/pkg/promise
...
Added Test Case Coverage for PKG/PROMISE
Upstream-commit: 16380b3ee68c0da2fda036d7980129241957220c
Component: engine
2017-06-19 13:53:42 -07:00
37ac27cec4
devmapper: ensure that UdevWait is called after calls to setCookie
...
Recent changes to devmapper broke the implicit requirement that UdevWait be
called after every call to task.setCookie. Failure to do so results in leaks of
semaphores in the LVM code, eventually leading to semaphore exhaustion.
Previously this was handled by calling UdevWait in a ubiquitous defer function.
While there was initially some concern with deferring the UdevWait function
would cause some amount of race possibiliy, the fact that we never return the
cookie value or any value used to find it, makes that possibility seem unlikely,
so lets go back to that method
Signed-off-by: Neil Horman <nhorman@tuxdriver.com >
Upstream-commit: 23dcfec1404411489e23fb9b76fc7096db139d04
Component: engine
2017-06-19 13:50:57 -04:00
aae660696a
Merge pull request #33695 from cpuguy83/volumes_check_ownership
...
Don't chown/chmod volumes if not needed.
Upstream-commit: 630b9a45d2537a21fa5ba3249a3c780d2b6a00fc
Component: engine
2017-06-19 06:31:58 -07:00
c832750e54
Remove Go 1.6 code from moby
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 6bfd0f6b5d08bcd609da11947432ad0f3aa3d8fd
Component: engine
2017-06-19 15:59:00 +03:00
0e43fa4b98
* standardize timeouts for log reads and writes for logger adapter tests
...
* use an assertion framework in logger adapter tests
Signed-off-by: Royce Remer <royceremer@gmail.com >
Upstream-commit: b3add005d5135f64670f6502357cde5bd8d03f75
Component: engine
2017-06-18 18:47:45 -07:00
0db82d1f6c
Don't chown/chmod volumes if not needed.
...
Doing a chown/chmod automatically can cause `EPERM` in some cases (e.g.
with an NFS mount). Currently Docker will always call chown+chmod on a
volume path unless `:nocopy` is passed in, but we don't need to make
these calls if the perms and ownership already match and potentially
avoid an uneccessary `EPERM`.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f05a023760493dbd41fbfc1bb76ad334b579e94e
Component: engine
2017-06-18 16:44:52 -07:00
8f272dd02c
Merge pull request #33403 from szegedim/33126-whitelist-adjtimex
...
Whitelisting adjtimex get time operation and requiring CAP_SYS_TIME only in case of adjustment
Upstream-commit: 4f259698b07653e9e5220e097df79862f9e54b74
Component: engine
2017-06-16 21:30:35 -07:00
