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
a375e303b3
Merge pull request #33757 from tonistiigi/update-docker-py
...
dockerfile: update docker-py
Upstream-commit: 29c0238cac6ecdf2bf81513570c4b5fec1bb5094
Component: engine
2017-06-21 10:23:54 +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
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
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
51efe95e2e
Merge pull request #33732 from nhorman/cookie-clean-up
...
devmapper: ensure that UdevWait is called after calls to setCookie
Upstream-commit: 7e3d0a54a136f66f85633a3ffa25004ecf7d19bf
Component: engine
2017-06-19 13:26:02 -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
43cd078fda
Merge pull request #33727 from rremer/test-cleanup-daemon-logger
...
cleanup daemon/logger/adapter_test.go
Upstream-commit: f0024808a1844cc5004461f40c5d840a48e14d48
Component: engine
2017-06-19 05:56:43 -07: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
3703860d4e
Merge pull request #33517 from naveed-jamil-tenpearls/pkg/reexec
...
Added Test Case Coverage for PKG/REEXEC
Upstream-commit: acf23c736724c861236d8b5cbee339c812fe9d7f
Component: engine
2017-06-16 15:24:51 +02:00
01abe5df95
Merge pull request #33712 from cyli/redact-ca-signing-cert
...
Redact swarm spec CA signing cert for usability reasons
Upstream-commit: 0919a1da149705f1ba50610346cea6f14574dd10
Component: engine
2017-06-16 09:21:59 -04:00
4b515641e8
Merge pull request #32547 from allencloud/make-ulimitOpt-implement-NamedOption
...
add NamedUlimitOpt to implement NamedOption to fix 32528
Upstream-commit: a6911bf8cc58195bced536b9e3f2b94edf2b5c15
Component: engine
2017-06-16 11:27:01 +02:00
5a0cf39b76
Merge pull request #33705 from tonistiigi/fix-cobra-vendor
...
vendor: remove unused package
Upstream-commit: cc73511764227fc3d229cd05adbf01abee593dcf
Component: engine
2017-06-16 10:35:50 +02:00
ead60478b8
add NamedUlimitOpt implement NamedOption to fix 32528
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 148f2711e8e78c9cf43b4c30b03b33b16d9e7098
Component: engine
2017-06-16 10:14:09 +08:00
d01b45b0ff
Redact the swarm's spec's signing CA cert when getting swarm info, because
...
otherwise if the user gets the info from the API, makes a non-CA related change,
then updates, swarm will interpret this as the user trying to remove the signing
key from the swarm. We are redacting due to usability reasons, not because
the signing cert is secret. The signing KEY is secret, hence it's redacted.
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: bdfbd22afbbf16a07f0316656c6c17453df3e0f7
Component: engine
2017-06-15 18:26:01 -07:00
a014e4af05
Merge pull request #33498 from darrenstahlmsft/IoTDataPartition
...
Skip evaluation of symlinks to data root on IoT Core
Upstream-commit: b931c35a46bd7606fca5bea0b80dc82c1ed7e0d5
Component: engine
2017-06-15 15:52:01 -07:00
7d5222b592
vendor: remove unused package
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 932759c288ef3055919388bc0319cddde0bee34a
Component: engine
2017-06-15 13:23:11 -07:00
a19bc856f6
Merge pull request #33585 from moypray/containerd_core
...
When daemon is in startup process, could not start container
Upstream-commit: 5eca8382b03278dc42c228b3d14dec0909ce655b
Component: engine
2017-06-15 09:13:41 -07:00
01e1289926
Add option for architecture to mkimage-alpine.sh
...
Signed-off-by: Robert Schneider <mail@shakeme.info >
Upstream-commit: 23f0c20b021849283fb422fab735d893c1946f46
Component: engine
2017-06-15 15:52:25 +02:00
6cc2ed537e
Fix getopts in mkimage-alpine.sh
...
Signed-off-by: Robert Schneider <mail@shakeme.info >
Upstream-commit: a89d282dbb9eefe043a7a2dcfb146b11ade720d1
Component: engine
2017-06-15 15:51:56 +02:00
f816b75526
Merge pull request #33302 from cpuguy83/fix_logs_racey_test_win
...
Make TestLogsAPIStdout a bit less racey
Upstream-commit: 6d92b0ee15cff0d5fade6533f696c7bc9f314021
Component: engine
2017-06-14 16:35:22 -07:00
440a9de896
Merge pull request #33680 from glensc/patch-1
...
doc: Update 2017-06-12.md
Upstream-commit: e5679f0bffa860f735b2db4309cc72b8871a96b5
Component: engine
2017-06-14 23:11:23 +02:00
cfd4f5c94e
Merge pull request #33361 from aaronlehmann/no-join-address
...
cluster: Only pass a join address when in the process of joining a cluster
Upstream-commit: c86323c19d77e94c280fec9fc78480939d176d1b
Component: engine
2017-06-14 14:08:37 -07:00
4b4286a493
Update 2017-06-12.md
...
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org >
Upstream-commit: 35e15c5c04174ee4bd71ae9ad226e996afa9b41d
Component: engine
2017-06-14 23:16:22 +03:00
3c78860ecb
Merge pull request #33637 from thaJeztah/improve-ci-build-time
...
Minor refactor/cleanup of tests
Upstream-commit: 7fdc2e42d1d8eadf38976c3363b994040ad28fa5
Component: engine
2017-06-14 19:45:48 +02:00
26df7d0bfd
Merge pull request #33640 from dsheets/pluginv2-static-start-but-disabled-error
...
plugin/store.Get: return a specific error if plugin is disabled
Upstream-commit: 397a57d3a5f057a3c787afa107964b692ec2ebe1
Component: engine
2017-06-14 15:35:26 +02:00
4e0a36e808
Merge pull request #33053 from simonferquel/ignore-private-networks
...
Ignore HNS networks with type `Private`
Upstream-commit: 0c2f3bcd822b798de806be825fd65bbe36d66bd8
Component: engine
2017-06-14 14:20:39 +02:00
18477cd2ed
When daemon is in startup process, could not start container
...
Description:
When docker is in startup process and containerd sends an "process exit" event to docker.
If the container config '--restart=always', restartmanager will start this container very soon.
But some initialization is not done, e.g. `daemon.netController`,when visit, docker would panic.
Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com >
Upstream-commit: 5b0993d6c778c18735692560538c790faa3dbbb4
Component: engine
2017-06-14 18:53:18 +08:00
75f90c1a7c
Merge pull request #33655 from dsheets/authz-disable-race
...
Eliminate authz plugin disable race
Upstream-commit: 11293d91f94418a454006ee93e88aed1861fcf27
Component: engine
2017-06-14 11:07:23 +02:00
9f19cc9a66
Merge pull request #33663 from vieux/report-2017-06-12
...
Moby Dev Report 2017 06 12
Upstream-commit: 7959c2e49d0f999c0d44e00febdbf390c0d3a944
Component: engine
2017-06-13 23:05:57 -05:00
86f07ae89f
Merge pull request #33665 from tiborvass/remove-docs
...
Remove docs (except docs/api), experimental/, contrib/completion, man/
Upstream-commit: 6d556df196d8dcf78e72e8bf0486f3f5156cfd73
Component: engine
2017-06-13 23:04:25 -05:00
42c5a6e86e
Remove docs (except docs/api), experimental/, contrib/completion, man/
...
They have been moved to github.com/docker/cli.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: b5579a4ce33af4c1f67118e11b5a01008a36d26a
Component: engine
2017-06-14 03:14:46 +00:00
ce3a475d7a
Moby June 12th dev report
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: b9dfa9ab753c6239905b4cc506d84dba458800a1
Component: engine
2017-06-13 19:02:26 -07:00
1b032e855d
Skip evaluation of symlinks to data root on IoT Core
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 8e71b1e210dc0eff980f39271d6c1dd48d87024e
Component: engine
2017-06-13 15:02:35 -07:00
