bdf4b74b52
Update bash-completion to reflect ability to push single tags
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-06-19 10:11:32 -06:00
346a350df4
Merge pull request #6538 from leeplay/patch-2
...
Update dockerlinks.md
2014-06-19 10:59:48 -05:00
181e54bff3
Merge pull request #6451 from cyphar/6445-fix-onbuild-passing-to-grandchildren
...
Ensure that ONBUILD triggers aren't committed to grandchildren
2014-06-19 18:11:33 +03:00
d7e5fdfb58
Fix minor typo
...
Docker-DCO-1.1-Signed-off-by: Kevin Houdebert kevin.houdebert@gmail.com (github: qwazerty)
2014-06-19 14:49:52 +02:00
10eae16fa7
Updated SSH example to ensure it continues working
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-06-19 07:44:41 -05:00
874698cb4a
Merge pull request #6524 from behemphi/patch-1
...
Update dockerizing.md
2014-06-19 07:06:02 -05:00
40966fa096
Fix installation docs to use the new boot2docker command: ip
...
Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com> (github: lalyos)
2014-06-19 13:00:45 +02:00
a57298791c
integration-cli: add build test for NOCACHE
...
This patch adds CLI integration tests to ensure that NOCACHE instructions
in Dockerfiles only apply to direct children of the original image.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
2014-06-19 20:33:17 +10:00
7303467c77
server: buildfile: ensure that ONBUILD triggers aren't committed
...
This patch fixes the bug where ONBUILD triggers are committed each build
step created during the ONBUILD trigger execution, since the triggers are
only wiped *after* all ONBUILD trigger steps have been committed. This was
fixed by simply copying the ONBUILD triggers and wiping the config
*before* committing anything.
Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
2014-06-19 20:33:17 +10:00
7b1f34d626
Update dockerlinks.md
...
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
2014-06-19 18:45:31 +09:00
80bc06f1cf
Fix flag names
2014-06-19 11:25:14 +02:00
cf331cdd6a
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)
2014-06-19 03:34:04 -04:00
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
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
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
a841152069
Update dockerizing.md
2014-06-18 22:50:56 -05:00
30313cacce
Merge pull request #6363 from proppy/patch-5
...
MAINTAINERS: add proppy for google.md
2014-06-18 18:03:29 -07:00
8646bf4a40
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
2014-06-18 17:50:24 -07:00
421707f638
Merge pull request #6518 from vieux/finish_remove_insert
...
cleanup all mentions of insert
2014-06-18 20:06:29 -04:00
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
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
b132e7b36d
discard ErrNotSupportedPlatform
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-06-18 23:42:22 +00:00
1ca7964cdd
Merge pull request #6257 from proppy/test-conntimeout
...
utils: add test for TimeoutConn
2014-06-18 16:23:39 -07:00
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
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
216b4c9cf6
Validate that one of streams choosen in logs on api side
...
Fixes #6506
There is the bug, that very hard to fix: When we return job.Errorf in
"logs" job it writes to job.Stderr, to which connected ResponseWriter and on
this write w.WriteHeader(http.StatusOK) is called. So, we get 200 on error
from "logs" job.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-18 23:34:46 +04:00
3303789b4f
More verbose error for parallel pull
...
Partially fixes #6484
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-18 23:30:52 +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
Tianon Gravi
James Turnbull
unclejack
Kevin "qwazerty" Houdebert
lalyos
cyphar
hyeongkyu.lee
David Gageot
Dinesh Subhraveti
Boyd Hemphill
Solomon Hykes
Fred Lifton
Tibor Vass
Sven Dowideit
O.S. Tezer
Victor Vieux
Victor Vieux
O.S. Tezer
Michael Crosby
Rick van de Loo
LK4D4
Daan van Berkel