84bd7e4c9e
Maintain a whitelist of capabilities rather than droplist
...
This fixes 6/18 vulnerability
Docker-DCO-1.1-Signed-off-by: Dinesh Subhraveti <dineshs@altiscale.com > (github: dineshs-altiscale)
Upstream-commit: cf331cdd6ad35c6e0d291df51b49aef5909671f5
Component: engine
2014-06-19 03:34:04 -04:00
67efe6867d
Merge pull request #6363 from proppy/patch-5
...
MAINTAINERS: add proppy for google.md
Upstream-commit: 30313cacce8d1b5c2e373fb2c08b539bfd25007f
Component: engine
2014-06-18 18:03:29 -07:00
6aadc112a6
Merge pull request #6518 from vieux/finish_remove_insert
...
cleanup all mentions of insert
Upstream-commit: 421707f638211807985d37d9baa5d941304a7487
Component: engine
2014-06-18 20:06:29 -04:00
350844d68d
Merge pull request #6424 from tianon/fix-minor-md2man-bug
...
Fix minor bug in contrib/man/md/md2man-all.sh causing the creation of contrib/man/manREADME
Upstream-commit: a790d3309cc37760bce4f580b79ce4d802ce7745
Component: engine
2014-06-19 09:57:23 +10:00
74082ef48f
Merge pull request #6517 from ostezer/docs-styles-update
...
Docs styles update
Upstream-commit: df217f537706ba89f17c40b54a8ddf40f41d4462
Component: engine
2014-06-18 16:53:46 -07:00
914e3a23b7
Merge pull request #6488 from crosbymichael/readme-security
...
Add security message to readme
Upstream-commit: c60d178ad03fed83f2fd1bd06c0c3fcd2d016545
Component: engine
2014-06-19 09:52:55 +10:00
d80bc787e6
Merge pull request #6257 from proppy/test-conntimeout
...
utils: add test for TimeoutConn
Upstream-commit: 1ca7964cdd6ee1b34067593e9196c9415345199f
Component: engine
2014-06-18 16:23:39 -07:00
b42966840e
cleanup all mentions of insert
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 3e2a9f667fbfd2b526b5bab4f8983f8c44685e87
Component: engine
2014-06-18 23:13:54 +00:00
20c86625c9
Merge pull request #6066 from tiborvass/5693-volumes-from-symlink-path
...
5693 volumes from symlink path
Upstream-commit: 7a0e5991421d423908504531bee7b5dc46443b3f
Component: engine
2014-06-18 16:10:37 -07:00
03e5a3ec60
Docs styling update/upgrade
...
Closes https://github.com/dotcloud/docker/issues/6514
Closes https://github.com/dotcloud/docker/issues/6377
Closes https://github.com/dotcloud/docker/issues/6514
Closes https://github.com/dotcloud/docker/pull/6502
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com > (github: ostezer)
Upstream-commit: 381050b1eeb90e3e91c16021b82a6e09cd307c41
Component: engine
2014-06-18 16:09:03 -07:00
37854d56d0
Merge pull request #6505 from vdloo/master
...
Fixes typo in loopback device error message
Upstream-commit: f3db32c03515353697644fabf4f73e0dfb1d4fc0
Component: engine
2014-06-18 15:55:51 -07:00
e2604caa0f
Merge pull request #5559 from bmurphy1976/bmurphy1976-history-bug
...
Test and fix history command ordering
Upstream-commit: d803523cdca38f4de61add3bd114373fe4ac0dc7
Component: engine
2014-06-18 14:34:00 -07:00
dec7c25a51
Merge pull request #6244 from tiborvass/fix_release_checklist
...
Fix documentation for release-checklist
Upstream-commit: 443d923f08bfcd4c9cc0115bd84861980e23355a
Component: engine
2014-06-18 13:52:51 -07:00
45850ea1bb
Fix documentation for release-checklist
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 586e72218ceeb90d31900af198d5c865e4b3e6e4
Component: engine
2014-06-18 16:45:15 -04:00
f362aed228
Fixes typo in loopback device error message
...
Docker-DCO-1.1-Signed-off-by: Rick van de Loo <rickvandeloo@gmail.com > (github: vdloo)
Upstream-commit: 98041d26bbe68458ca1c2ac7074ef600e832753e
Component: engine
2014-06-18 22:09:28 +02:00
8a9e50b1f5
fix bug in getRootResourcePath in previous commit
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 48907d57ede696c68e210cb93cb405124a49cbd3
Component: engine
2014-06-18 15:51:28 -04:00
c1fafcf79b
daemon: *: updated getResourcePath and getRootResourcePath signatures
...
This patch updates container.getResourcePath and container.getRootResourcePath
to return the error from symlink.FollowSymlinkInScope (rather than using utils).
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Remove Inject to help rebase
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Docker-DCO-1.1-Signed-off-by: cyphar <cyphar@cyphar.com > (github: tiborvass)
Upstream-commit: 5c069940db2042d83bd4ef462a8a50d565aaf874
Component: engine
2014-06-18 15:51:28 -04:00
807354f6af
expose unresolved path for volumes and resolve symlink in container.getResourcePath
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 65d4047cb60ec77a4009d25c91b29f95375c8fe5
Component: engine
2014-06-18 15:51:27 -04:00
13250a8dcd
rename TestVolumeWithSymlink to TestCreateVolumeWithSymlink and remove run_tests folder
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: def86d0cf4d80e037f2ecabdff68bab6652cb741
Component: engine
2014-06-18 15:51:27 -04:00
788ab1fd24
add integration test
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: c4c92e66cdb9fa4c141b4fa4872af37037e1bbe2
Component: engine
2014-06-18 15:50:39 -04:00
c68805e2a6
Merge pull request #5878 from timthelion/docs-docker-readme
...
Add README.md file for the docker directory
Upstream-commit: 7c52ab7f83a7e37f283d4c237111adc18bdf22b4
Component: engine
2014-06-18 12:19:43 -07:00
e8772fc4e0
Merge pull request #6399 from dvberkel/master
...
use a numbered list for maintainers responsibility
Upstream-commit: 40b55a4174ab00d87ea9238929bb0f245eaa7be7
Component: engine
2014-06-18 11:57:46 -07:00
cbe82680cb
Merge pull request #6495 from vieux/pr_6269
...
Fix go vet errors
Upstream-commit: f53b922f40c43a58c1c7d3ff1ee489e137837a10
Component: engine
2014-06-18 11:02:17 -07:00
172faefd3c
Fix go vet errors
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: f08cd445b0d2e44a4977a3bd0dca0a1cd4e76d2f
Component: engine
2014-06-18 17:39:57 +00:00
fcfb5dfdd4
Wrap lines in security notice
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: d9d08c5ef5ad395cceea0a1c54c6a4df744e6ee1
Component: engine
2014-06-18 10:15:51 -07:00
df1151b70b
Merge pull request #6487 from vbatts/vbatts-error_info
...
adding a little uniqueness, to wrapped errors.
Upstream-commit: 331ae9c0f8a57b34b91b460350d0a354822d0091
Component: engine
2014-06-18 11:43:59 -04:00
17421dcea4
Merge pull request #6497 from SvenDowideit/awscli-changes
...
pin awscli to 1.3.9, and then complexify the sync's to make them more li...
Upstream-commit: 4195fc04941d4f780187bdcc65c0a9d240216cd6
Component: engine
2014-06-18 08:46:30 -05:00
3f0a0cfaf2
Merge pull request #6499 from SvenDowideit/add-redirects-for-renames
...
compared the 0.11 sitemap to the 1.0 one and these are the differences
Upstream-commit: ffe3ae7bfba3c17480ba11929fb7581b9089057f
Component: engine
2014-06-18 08:43:32 -05:00
74a8a70c93
Merge pull request #6468 from jstoja/6374-docs-apache-image
...
Docs: apache image on installation
Upstream-commit: 2294294e19798a1c2ceb90c5a31a532bb85869c7
Component: engine
2014-06-18 08:19:58 -05:00
14681fef9b
use a numbered list for maintainers responsibility
...
At the moment maintainers responsibility are spelled out with a hybrid
list. I.e. an unordered list with an associated number.
In this commit I the number list proper is used.
Docker-DCO-1.1-Signed-off-by: Daan van Berkel <daan.v.berkel.1980@email.com > (github: dvberkel)
Upstream-commit: cc96d312526dac5eff3e0521b921e08301715ce5
Component: engine
2014-06-18 14:31:26 +02:00
43a017ff69
fixed docker port command
...
Upstream-commit: 438d26b4052307c29354edc9cd01e35d2e05137a
Component: engine
2014-06-18 15:01:29 +09:00
d83699654c
compared the 0.11 sitemap to the 1.0 one and these are the differences
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 42fe9327b9bb15354c5a7bdfee25f42e122fd994
Component: engine
2014-06-18 15:39:30 +10:00
61da490d61
pin awscli to 1.3.9, and then complexify the sync's to make them more likely to complete
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 6b352d1cfe33cb3f5f64a3c18bb9931e9225adf8
Component: engine
2014-06-18 12:38:45 +10:00
3fdde76d71
Merge pull request #6490 from icecrime/6203-artifacts_on_events_output
...
Avoid erasing line for non-progress messages
Upstream-commit: f0ec9018194e9fddecfde29050aed1169c1fe94c
Component: engine
2014-06-17 16:26:51 -07:00
1d007f754c
Merge pull request #6199 from icecrime/event_subscription_refactoring
...
Event subscription refactoring
Upstream-commit: d0fe1147ea6bb98e87a573f078e1572f6061e04b
Component: engine
2014-06-17 17:39:28 -04:00
ba33babd07
Merge pull request #6415 from LK4D4/increase_timeout_in_test_attach
...
Increase time before exit in TestMultipleAttachRestart
Upstream-commit: ec0fb311ed01615c0e2773cd224f43de94a762ab
Component: engine
2014-06-18 00:36:18 +03:00
43d16abb08
Merge pull request #6320 from LK4D4/fix_stdcopy_eof
...
Don't exit on eof in header reading in stdcopy
Upstream-commit: 4dcf4e9bd0e9c68369dd73fb8dfbf419e0ab68d6
Component: engine
2014-06-17 14:20:13 -07:00
5490b8933d
Merge pull request #6489 from vieux/fix_mflags_panic
...
prevent panic when empty flag
Upstream-commit: 3336bdf5b5ac9753df549a8434de820c06260a65
Component: engine
2014-06-17 14:04:20 -07:00
a1e9b8d6d0
Merge pull request #6405 from gsalgado/migrate-test-getcontainersbyname
...
Convert TestGetContainersByName into a unit test
Upstream-commit: ba4ae2c46d0ea77eecb05b2b01405dbeffafc58b
Component: engine
2014-06-17 14:01:42 -07:00
da13f8faf7
Merge pull request #6485 from crosbymichael/update-libcontainer
...
Update libcontainer dependency to 77ffd49dfedbc78a
Upstream-commit: 092826152cdfcb125bafdf5c9fed911e304feccf
Component: engine
2014-06-17 16:57:35 -04:00
928e8a4f4b
Merge pull request #6471 from LK4D4/more_buildfile_tests_to_cli
...
Move more buildfile tests to integration-cli
Upstream-commit: c7fdd51eb6407fba41200e7a14f652519b179b71
Component: engine
2014-06-17 13:54:55 -07:00
2883b4234a
prevent panic when empty flag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: 661a1e90263cc348c17620cf0b250bf552dd4056
Component: engine
2014-06-17 20:45:57 +00:00
c5861c6a61
Avoid erasing line for non-progress messages
...
The JSONMessage.Display methods erases the entire line by outputting the <ESC>[2K\r sequence before displaying the message content. This is not necessary for messages other than progress indicators, and introduces unwanted characters in the /events output.
Fixes #6203 .
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com > (github: icecrime)
Upstream-commit: 3807f8b708b60588526f555190d14a37db408450
Component: engine
2014-06-17 22:40:34 +02:00
2bb744cf51
Add security message to readme
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 9e2cc4fcd9c28f80877d930cb5cc6076428e8ef8
Component: engine
2014-06-17 13:26:26 -07:00
e3f7ac181c
Update libcontainer dependency to 77ffd49dfedbc78a
...
Fixes #6256
Fixes #6383
Fixes #6414
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com > (github: crosbymichael)
Upstream-commit: 698ded75b9aa076f4278398e56fa95e90e900d2b
Component: engine
2014-06-17 13:09:36 -07:00
1c06016fa3
adding a little uniqueness, to wrapped errors.
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 4902f047d3c6c37138a51bee05a3a48552619884
Component: engine
2014-06-17 16:07:34 -04:00
5ad6516933
Refactor events publishing
...
Events subscription (/events API endpoint) attributes pseudo-unique identifiers to incoming subscribers: originally its host, then its subscription time. This is unecessary and leads to code complexity.
Introduce a JSONMessagePublisher to provide simple pub/sub mechanism for JSONMessage, and rely on this new type to publish events to all subscribed listeners. The original logic is kept for the 'since' and 'until' parameters, and for client disconnection handling.
Docker-DCO-1.1-Signed-off-by: Arnaud Porterie <icecrime@gmail.com > (github: icecrime)
Upstream-commit: d0c4e448632f49b73bf63862a4b20b142ff7f2c9
Component: engine
2014-06-17 21:56:22 +02:00
017a78b3c1
Move TestBuildAddToSymlinkDest to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: cc42eeac21caa962bed94878fe2eab00735cd00d
Component: engine
2014-06-17 23:44:30 +04:00
551ab6b3bc
Merge pull request #6356 from mattyw/master
...
fixed a broken link in the readme
Upstream-commit: 52edbe6a23f3c052d19aedccc5efb6571bfc24f8
Component: engine
2014-06-17 11:00:46 -07:00
c38b2639f5
fixed a broken link in the docs
...
Docker-DCO-1.1-Signed-off-by: Matt Williams <lp@mattyw.net > (github: mattyw)
Upstream-commit: d4ec4d6e9b273bfc6a1f0e88edcddcd9e742bbab
Component: engine
2014-06-17 18:36:59 +01:00
