2bcbb3285b
Merge pull request #11274 from MabinGo/selinux_enable_verify
...
Add logs when Docker enabled selinux (closes #11197 )
Upstream-commit: fdf49d758f6f93d04077ad0c82a7fd7312b2ffdc
Component: engine
2015-03-19 10:34:55 -04:00
1d92cf5680
Merge pull request #11453 from duglin/HideDaemonDots
...
Hide dots on daemon startup when loglevel != info
Upstream-commit: 9d5eab18737adc82e3191c7708e5df540d0b485e
Component: engine
2015-03-19 10:10:18 -04:00
5e77b6e481
Merge pull request #11455 from tianon/minor-formatting-consistency
...
Fix several very minor consistency issues
Upstream-commit: ae1d3d6d6851c2721bae94f0c7c0c0af9b866392
Component: engine
2015-03-19 09:57:57 -04:00
6061dc16e1
Merge pull request #11496 from docker/revert-11495-m3
...
Revert "correct comment errors for netlink_linux.go"
Upstream-commit: 27fd77cc3be15208071029e4659f67163a44574e
Component: engine
2015-03-19 09:38:25 -04:00
eec8373c1c
Revert "correct comment errors for netlink_linux.go"
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: d173669fdff8ec1acc33d2da28e2a473a3844e56
Component: engine
2015-03-19 14:38:00 +02:00
0b3e883c9e
Merge pull request #11495 from sunyuan3/m3
...
correct comment errors for netlink_linux.go
Upstream-commit: 70092e5ebbb0afe9ce6b125643265541298309fe
Component: engine
2015-03-19 08:29:54 -04:00
d2b7fa6417
correct comment errors for netlink_linux.go
...
Signed-off-by: s00318865 <sunyuan3@huawei.com >
Upstream-commit: c5fdc93f89db3cb3ea4489999296487fad0f440d
Component: engine
2015-03-19 20:29:30 +08:00
27ea0d1653
Merge pull request #11488 from stevvooe/address-digest-deadlock
...
Correctly close pipe after error in tarsum verification
Upstream-commit: c861231a70342472ad9322320bf6fb62e6afba35
Component: engine
2015-03-18 23:00:13 -07:00
a7ed4dc483
Merge pull request #11028 from jstangroome/patch-1
...
Correct IP/MAC address generation docs
Upstream-commit: 33bec0a7f63695d6fa60a79c8732d49623d30223
Component: engine
2015-03-19 01:44:43 -04:00
b16d50a307
Correctly close pipe after error in tarsum verification
...
This addresses a subtle deadlock where an error during a copy prevented pipe
closure to propagate correctly. By closing down the read end of the pipe rather
than the write end, the waiting writer is properly signaled. A nice side-effect
of this change is that errors encountered by io.Copy are now propagated to the
verifier's Write method.
A test to ensure validation errors for unsupported digest types has been added,
as well.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 0306a41909175b467d08ebc97d4c5136ca9e7ebd
Component: engine
2015-03-18 19:07:55 -07:00
ccb5c44c68
Add logs when Docker enabled selinux
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: 1bf529a45674dc07de6efba806b854f63f3dc0bf
Component: engine
2015-03-19 09:46:53 +08:00
793cdf14d1
Merge pull request #11410 from cpuguy83/10191_build_resources
...
Allow setting resource constraints for build
Upstream-commit: 2cde817458a6ff3d371406cf226552fbd4fd3de9
Component: engine
2015-03-18 21:44:21 -04:00
5e80a64076
Allow setting resource constrains for build
...
Closes #10191
Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e6ae89a45a699bd44f03517396777e34ec76018b
Component: engine
2015-03-18 20:57:13 -04:00
30161bd9a1
Merge pull request #11452 from jeffdm/master
...
Adding Kitematic link to Mac OS X install instructions in docs
Upstream-commit: 068d343ddfad23ca2f7b407f5be03803029ac311
Component: engine
2015-03-18 17:32:48 -07:00
545bbe667a
Adding Kitematic link to Mac OS X install instructions
...
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com >
Upstream-commit: 3ddf5d75179f529356f19acb77e46e97388d4490
Component: engine
2015-03-18 16:32:59 -07:00
a0dccb769e
Merge pull request #11328 from jfrazelle/fix-docs-release-script
...
Fix clear cache docs release.
Upstream-commit: 42f5c874254798c2e2bc8060939e48ade5c97e23
Component: engine
2015-03-18 16:06:27 -07:00
47d9382364
Merge pull request #11430 from jfrazelle/export_outputflag
...
Modified `docker export` to allow an --output flag
Upstream-commit: 8ec4e698395fb18ed6a6ec1f17798bc05230f0fa
Component: engine
2015-03-18 19:04:43 -04:00
7ce99f1b4f
Merge pull request #11471 from LK4D4/wait_for_copier
...
Wait for copier finishing it's work before closing logger
Upstream-commit: 474f58e2e73de477e6b9a827e100f3f22f52048a
Component: engine
2015-03-18 15:41:12 -07:00
6d9a5811c0
Merge pull request #11474 from crosbymichael/null-masked-paths
...
Do not mask /proc/kcore in privileged
Upstream-commit: e1a0bff6b8aefdea341d01a75a0c7e9235cda421
Component: engine
2015-03-18 14:43:13 -07:00
9bbf5e7c87
Merge pull request #11472 from LK4D4/logger_mutex
...
Protect jsonfilelog writes with mutex
Upstream-commit: 54232084c59b0356141f5630beafdfc2d58970e9
Component: engine
2015-03-18 17:20:03 -04:00
dc45397f85
Do not mask /proc/kcore in privileged
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: f4a458e67f9cedae9167cc70d15fd8bbe942f880
Component: engine
2015-03-18 14:17:21 -07:00
e9cf3bba10
Merge pull request #11271 from dmcgowan/v2-sha256
...
Push and pull to v2 registries with sha256 instead of tarsum
Upstream-commit: d0e5f52fbb1eab460e127e64629a2a26f9bc4a83
Component: engine
2015-03-18 16:53:47 -04:00
803adf7842
Merge pull request #11464 from ncdc/fix-duplicate-dangling-images
...
Fix duplicate display of dangling images
Upstream-commit: 29f809233e58547389da040859a8c286288c4d8a
Component: engine
2015-03-18 13:53:33 -07:00
783795eacd
Wait for copier finishing it's work before closing logger
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b6a42673abb8c2df5920343b9144a4ce422b2d50
Component: engine
2015-03-18 13:48:01 -07:00
4af8cc6694
Protect jsonfilelog writes with mutex
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bd8661e8fafd5f80ce12fa966b9f8e990b7d7714
Component: engine
2015-03-18 13:00:53 -07:00
ea8c209cf2
Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144
...
Clarify behavior of docker cp
Upstream-commit: 50bf3cbedc923985868bd84515460aad174dcccb
Component: engine
2015-03-18 08:46:52 -07:00
f8293aa682
Fix duplicate display of dangling images
...
Signed-off-by: Andy Goldstein <agoldste@redhat.com >
Upstream-commit: c680dd9e5adfe7255ac4499bff26bbb6edf7fe78
Component: engine
2015-03-18 10:41:01 -04:00
c30f3dbe16
Merge pull request #11314 from HammerOfThor/pull_err_print
...
print detailed error info for docker pull
Upstream-commit: 9732c254ad6eba3a1707f5b45b9023e672ca8613
Component: engine
2015-03-18 08:08:01 -04:00
ef14748f1d
Fix several very minor consistency issues
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: ae61593417bd9bcf3d862f79271c7d5b83c1e6d5
Component: engine
2015-03-17 23:01:40 -06:00
9817390387
print detailed error info for docker pull
...
When docker push get response with unknown HTTP status, docker daemon
print:
"Error: Status XXX trying to push repository XXX: XXX"
But when docker pull meets response with unknown status code, it gives:
"HTTP code: XXX"
This commit helps docker pull print more detailed error info like push
does, so push and pull can behave consistently when error happens.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: efa65d16b6e0b835c1786a47140c974e5c0f71cb
Component: engine
2015-03-18 11:35:44 +08:00
dc3c53ce55
Merge pull request #11450 from crosbymichael/rlimitfix
...
Don't hardcode default rlimit
Upstream-commit: cf071bb9620cc36ab446c467a332a7c287856726
Component: engine
2015-03-17 20:27:05 -07:00
883ebf04a4
Merge pull request #11320 from estesp/fix-daemon-startup
...
Fix daemon shutdown on error after rework of daemon startup
Upstream-commit: a5269223a78d963774b12359a1e505b10fa9ac81
Component: engine
2015-03-17 19:04:25 -07:00
934073fd57
Hide dots on daemon startup when loglevel != info
...
When the deamon starts up with log level set to INFO it will show something
like this:
```
INFO[0000] Loading containers: start.
................................................................
INFO[0000] Loading containers: done.
```
where the dots represent containers in the system.
When you run with log level set to "error" it will still show the dots
w/o the "Loading..." lines before and after which looks really odd.
This PR will fix it so that the dots are only shown IFF the "Loading..."
lines are also shown
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 88dc6cc2dfcc538f433c98c18652a5c84b0769d9
Component: engine
2015-03-17 17:27:53 -07:00
b6b5f87d20
Don't hardcode default rlimit
...
The default for rlimit handling should be to inherit the rlimit of the
daemon unless explicitly set.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: f5a154f2d2b2bea5054ae35314d15021a8bf8ae4
Component: engine
2015-03-17 16:04:15 -07:00
00afc52ed0
Merge pull request #11237 from thaJeztah/docs-remove-temporary-styles
...
cleanup: docs: remove temporary inline styles
Upstream-commit: ef78cc01916da2dc77811c67864dd65f225b7452
Component: engine
2015-03-17 15:09:17 -07:00
d74344f45f
Merge pull request #11431 from jfrazelle/update-docs-image-on-make
...
Update docs/base in makefile docs-build.
Upstream-commit: 8e6d0107df333c29f736e69442a81ed001a41073
Component: engine
2015-03-17 14:49:24 -07:00
b486ed31bd
cleanup: docs: remove temporary inline styles
...
Some inline `<style>` tags were temporarily added to the documentation
because the documentation-stylesheets where not yet updated to the
latest version (see https://github.com/docker/docker/pull/11231 and
https://github.com/docker/docker/pull/11229#issuecomment-77698868 ).
This removes those temporary `<style>` tags.
depends on #11230 (https://github.com/docker/docker/issues/11230 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4e6a01023b7422dc3df7f02e248bb06361069fcc
Component: engine
2015-03-17 22:48:28 +01:00
081bc20c46
Merge pull request #11448 from vishh/port_log
...
Reduce logging level for "ip_local_port_range" proc file in not accessible.
Upstream-commit: f42acd070afeefd630952c69fafa58f0121797fb
Component: engine
2015-03-17 14:52:23 -04:00
26ddd6db93
Fix daemon shutdown on error after rework of daemon startup
...
Currently the daemon will not stop on error because the serve API job is
blocking the channel wait for daemon init. A better way is to run the
blocking serve API job as a goroutine and make sure that error
notification gets back to the main daemon thread (using the already
existing channel) so that clean shutdown can occur on error.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 459e58ffc9bff8206a860fb63f973e4f07129756
Component: engine
2015-03-17 14:15:00 -04:00
1816ded115
Merge pull request #11355 from moxiegirl/11023-ubuntu-install
...
Updating Ubuntu installation to use wget; eliminating elo
Upstream-commit: c1639a7e4e4667e25dd8c39eeccb30b8c8fc6357
Component: engine
2015-03-17 14:11:27 -04:00
3105d32a23
Support push and pull of sha256
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 514be385f7451df8bbf9e1a7bb015e3baec406f1
Component: engine
2015-03-17 10:50:35 -07:00
bda242c975
Vendor distribution/digest
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 75e29f4550027f02aa0c61ceeb53315c9f627571
Component: engine
2015-03-17 10:47:45 -07:00
28753b690d
Merge pull request #11298 from brahmaroutu/gccgo_script
...
Initial gccgo build script, requires host to contain gccgo 5.0
Upstream-commit: e35c78a4954c2d8b1c3963d3190ab3cfd3a48342
Component: engine
2015-03-17 13:45:47 -04:00
8da4d5374d
Reduce logging level from error to warning if "/proc/sys/net/ipv4/ip_local_port_range" proc file in not accessible.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 39d49ba7ba21f204f5fc174aaf319ed1cdad790f
Component: engine
2015-03-17 17:39:17 +00:00
b2a50dead1
Merge pull request #11444 from albers/bash-completion
...
Updates to bash completion
Upstream-commit: c858cbffe06897966033dab9af31f877af4d2f47
Component: engine
2015-03-17 10:25:46 -07:00
cf394b41e4
# This is a combination of 2 commits.
...
# The first commit's message is:
Updating Ubuntu installation to use wget; eliminating elo
Signed-off-by: Mary Anthony <mary.anthony@docker.com >
# This is the 2nd commit message:
Adding in James comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: f60ed98e79fbc91e7aa280769c62c5a59c7eba00
Component: engine
2015-03-17 10:15:46 -07:00
b221b456d5
Merge pull request #11447 from moxiegirl/black-to-back-fixes
...
Fixing it back
Upstream-commit: ed6685369740035b0af9675bf9add52d0af7657b
Component: engine
2015-03-17 13:09:16 -04:00
176e29d9be
Fixing it back
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 241579a34faed177100f407465a6ae47bb5b98d2
Component: engine
2015-03-17 10:07:09 -07:00
d3fdbf9469
Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882
...
Return of the Ring: Metadata Labels Doc Tweaks
Upstream-commit: 2ab105e9fe604bb709dfaf25a19f4af003a8ddad
Component: engine
2015-03-17 09:47:36 -07:00
90fc12f567
Merge pull request #10568 from LK4D4/logging_drivers
...
Logging drivers
Upstream-commit: 1ff5a91007f01d2d61a7b2066db2e164085f0d1b
Component: engine
2015-03-17 09:45:58 -07:00
