James Turnbull
bf69b773ec
Fixed #6545 - Updated Security article
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-19 16:13:20 -05:00
James Turnbull
874698cb4a
Merge pull request #6524 from behemphi/patch-1
...
Update dockerizing.md
2014-06-19 07:06:02 -05:00
James Turnbull
b1c114c3a7
Merge pull request #6519 from fredlf/latest-copyedits
...
Copy edits to dockerhub.md, fixed a broken link.
2014-06-19 01:45:20 -05:00
Tianon Gravi
b13cdb01bd
Merge pull request #6427 from tianon/fix-zsh-completion-mode
...
Fix mode on contrib/completion/zsh/_docker (-x)
2014-06-18 23:01:07 -06:00
Tianon Gravi
f619243099
Fix mode on contrib/completion/zsh/_docker (-x)
...
ZSH completion scripts aren't supposed to be executable - they're sourced by ZSH and aren't run directly.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-18 22:59:20 -06:00
Boyd Hemphill
a841152069
Update dockerizing.md
2014-06-18 22:50:56 -05:00
Solomon Hykes
30313cacce
Merge pull request #6363 from proppy/patch-5
...
MAINTAINERS: add proppy for google.md
2014-06-18 18:03:29 -07:00
Fred Lifton
8646bf4a40
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-18 17:50:24 -07:00
Tibor Vass
421707f638
Merge pull request #6518 from vieux/finish_remove_insert
...
cleanup all mentions of insert
2014-06-18 20:06:29 -04:00
Sven Dowideit
a790d3309c
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
2014-06-19 09:57:23 +10:00
O.S. Tezer
df217f5377
Merge pull request #6517 from ostezer/docs-styles-update
...
Docs styles update
2014-06-18 16:53:46 -07:00
Sven Dowideit
c60d178ad0
Merge pull request #6488 from crosbymichael/readme-security
...
Add security message to readme
2014-06-19 09:52:55 +10:00
Victor Vieux
1ca7964cdd
Merge pull request #6257 from proppy/test-conntimeout
...
utils: add test for TimeoutConn
2014-06-18 16:23:39 -07:00
Victor Vieux
3e2a9f667f
cleanup all mentions of insert
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-18 23:13:54 +00:00
Victor Vieux
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
O.S. Tezer
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
Victor Vieux
f3db32c035
Merge pull request #6505 from vdloo/master
...
Fixes typo in loopback device error message
2014-06-18 15:55:51 -07:00
Michael Crosby
d803523cdc
Merge pull request #5559 from bmurphy1976/bmurphy1976-history-bug
...
Test and fix history command ordering
2014-06-18 14:34:00 -07:00
Michael Crosby
443d923f08
Merge pull request #6244 from tiborvass/fix_release_checklist
...
Fix documentation for release-checklist
2014-06-18 13:52:51 -07:00
Tibor Vass
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
Rick van de Loo
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
Tibor Vass
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
cyphar
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Victor Vieux
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
Michael Crosby
40b55a4174
Merge pull request #6399 from dvberkel/master
...
use a numbered list for maintainers responsibility
2014-06-18 11:57:46 -07:00
Michael Crosby
f53b922f40
Merge pull request #6495 from vieux/pr_6269
...
Fix go vet errors
2014-06-18 11:02:17 -07:00
LK4D4
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
Michael Crosby
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
Tibor Vass
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
James Turnbull
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
James Turnbull
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
James Turnbull
2294294e19
Merge pull request #6468 from jstoja/6374-docs-apache-image
...
Docs: apache image on installation
2014-06-18 08:19:58 -05:00
Daan van Berkel
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
James Turnbull
0c5d9626b8
Merge pull request #6500 from leeplay/userguide
...
fixed docker port command
2014-06-18 01:25:28 -05:00
kyu
438d26b405
fixed docker port command
2014-06-18 15:01:29 +09:00
SvenDowideit
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
SvenDowideit
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
Victor Vieux
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
Tibor Vass
d0fe1147ea
Merge pull request #6199 from icecrime/event_subscription_refactoring
...
Event subscription refactoring
2014-06-17 17:39:28 -04:00
unclejack
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
Michael Crosby
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
Victor Vieux
3336bdf5b5
Merge pull request #6489 from vieux/fix_mflags_panic
...
prevent panic when empty flag
2014-06-17 14:04:20 -07:00
Michael Crosby
ba4ae2c46d
Merge pull request #6405 from gsalgado/migrate-test-getcontainersbyname
...
Convert TestGetContainersByName into a unit test
2014-06-17 14:01:42 -07:00
Tibor Vass
092826152c
Merge pull request #6485 from crosbymichael/update-libcontainer
...
Update libcontainer dependency to 77ffd49dfedbc78a
2014-06-17 16:57:35 -04:00
Victor Vieux
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
Victor Vieux
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
Arnaud Porterie
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