df217f5377
Merge pull request #6517 from ostezer/docs-styles-update
...
Docs styles update
2014-06-18 16:53:46 -07:00
c60d178ad0
Merge pull request #6488 from crosbymichael/readme-security
...
Add security message to readme
2014-06-19 09:52:55 +10:00
1ca7964cdd
Merge pull request #6257 from proppy/test-conntimeout
...
utils: add test for TimeoutConn
2014-06-18 16:23:39 -07:00
7a0e599142
Merge pull request #6066 from tiborvass/5693-volumes-from-symlink-path
...
5693 volumes from symlink path
2014-06-18 16:10:37 -07:00
381050b1ee
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)
2014-06-18 16:09:03 -07:00
f3db32c035
Merge pull request #6505 from vdloo/master
...
Fixes typo in loopback device error message
2014-06-18 15:55:51 -07:00
d803523cdc
Merge pull request #5559 from bmurphy1976/bmurphy1976-history-bug
...
Test and fix history command ordering
2014-06-18 14:34:00 -07:00
443d923f08
Merge pull request #6244 from tiborvass/fix_release_checklist
...
Fix documentation for release-checklist
2014-06-18 13:52:51 -07:00
586e72218c
Fix documentation for release-checklist
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-18 16:45:15 -04:00
98041d26bb
Fixes typo in loopback device error message
...
Docker-DCO-1.1-Signed-off-by: Rick van de Loo <rickvandeloo@gmail.com> (github: vdloo)
2014-06-18 22:09:28 +02:00
48907d57ed
fix bug in getRootResourcePath in previous commit
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-18 15:51:28 -04:00
5c069940db
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)
2014-06-18 15:51:28 -04:00
65d4047cb6
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)
2014-06-18 15:51:27 -04:00
def86d0cf4
rename TestVolumeWithSymlink to TestCreateVolumeWithSymlink and remove run_tests folder
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-18 15:51:27 -04:00
c4c92e66cd
add integration test
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-06-18 15:50:39 -04:00
7c52ab7f83
Merge pull request #5878 from timthelion/docs-docker-readme
...
Add README.md file for the docker directory
2014-06-18 12:19:43 -07:00
40b55a4174
Merge pull request #6399 from dvberkel/master
...
use a numbered list for maintainers responsibility
2014-06-18 11:57:46 -07:00
f53b922f40
Merge pull request #6495 from vieux/pr_6269
...
Fix go vet errors
2014-06-18 11:02:17 -07:00
f08cd445b0
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)
2014-06-18 17:39:57 +00:00
d9d08c5ef5
Wrap lines in security notice
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-18 10:15:51 -07:00
331ae9c0f8
Merge pull request #6487 from vbatts/vbatts-error_info
...
adding a little uniqueness, to wrapped errors.
2014-06-18 11:43:59 -04:00
4195fc0494
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...
2014-06-18 08:46:30 -05:00
ffe3ae7bfb
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
2014-06-18 08:43:32 -05:00
2294294e19
Merge pull request #6468 from jstoja/6374-docs-apache-image
...
Docs: apache image on installation
2014-06-18 08:19:58 -05:00
cc96d31252
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)
2014-06-18 14:31:26 +02:00
0c5d9626b8
Merge pull request #6500 from leeplay/userguide
...
fixed docker port command
2014-06-18 01:25:28 -05:00
438d26b405
fixed docker port command
2014-06-18 15:01:29 +09:00
42fe9327b9
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)
2014-06-18 15:39:30 +10:00
6b352d1cfe
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)
2014-06-18 12:38:45 +10:00
f0ec901819
Merge pull request #6490 from icecrime/6203-artifacts_on_events_output
...
Avoid erasing line for non-progress messages
2014-06-17 16:26:51 -07:00
d0fe1147ea
Merge pull request #6199 from icecrime/event_subscription_refactoring
...
Event subscription refactoring
2014-06-17 17:39:28 -04:00
ec0fb311ed
Merge pull request #6415 from LK4D4/increase_timeout_in_test_attach
...
Increase time before exit in TestMultipleAttachRestart
2014-06-18 00:36:18 +03:00
4dcf4e9bd0
Merge pull request #6320 from LK4D4/fix_stdcopy_eof
...
Don't exit on eof in header reading in stdcopy
2014-06-17 14:20:13 -07:00
3336bdf5b5
Merge pull request #6489 from vieux/fix_mflags_panic
...
prevent panic when empty flag
2014-06-17 14:04:20 -07:00
ba4ae2c46d
Merge pull request #6405 from gsalgado/migrate-test-getcontainersbyname
...
Convert TestGetContainersByName into a unit test
2014-06-17 14:01:42 -07:00
092826152c
Merge pull request #6485 from crosbymichael/update-libcontainer
...
Update libcontainer dependency to 77ffd49dfedbc78a
2014-06-17 16:57:35 -04:00
c7fdd51eb6
Merge pull request #6471 from LK4D4/more_buildfile_tests_to_cli
...
Move more buildfile tests to integration-cli
2014-06-17 13:54:55 -07:00
661a1e9026
prevent panic when empty flag
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-17 20:45:57 +00:00
3807f8b708
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)
2014-06-17 22:40:34 +02:00
9e2cc4fcd9
Add security message to readme
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
2014-06-17 13:26:26 -07:00
698ded75b9
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)
2014-06-17 13:09:36 -07:00
4902f047d3
adding a little uniqueness, to wrapped errors.
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-06-17 16:07:34 -04:00
d0c4e44863
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)
2014-06-17 21:56:22 +02:00
cc42eeac21
Move TestBuildAddToSymlinkDest to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 23:44:30 +04:00
52edbe6a23
Merge pull request #6356 from mattyw/master
...
fixed a broken link in the readme
2014-06-17 11:00:46 -07:00
d4ec4d6e9b
fixed a broken link in the docs
...
Docker-DCO-1.1-Signed-off-by: Matt Williams <lp@mattyw.net> (github: mattyw)
2014-06-17 18:36:59 +01:00
207d7807af
Now using the nginx docker image instead of the apache one. dotcloud/docker/issues/6374
...
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com> (github: jstoja)
2014-06-18 00:38:04 +08:00
bf9482987f
Merge pull request #6470 from adelton/dns-no-hostname
...
The docker run --dns does not resolve hostname and having hostname in resolv.conf does not work.
2014-06-17 10:13:12 -05:00
0ba7f934ee
Merge pull request #6473 from leeplay/userguide
...
fix missing TAG for docker run
2014-06-17 06:23:06 -05:00
087acccf0c
Merge pull request #6469 from mariusv/patch-1
...
fixed Automated Build page link
2014-06-17 06:16:35 -05:00
O.S. Tezer
Sven Dowideit
Victor Vieux
O.S. Tezer
Michael Crosby
Tibor Vass
Rick van de Loo
cyphar
LK4D4
James Turnbull
Daan van Berkel
kyu
SvenDowideit
unclejack
Victor Vieux
Arnaud Porterie
Vincent Batts
mattyw
Julien Bordellier