0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9002 commits 14 branches 412 tags 338 MiB
Commit graph

9002 commits

This branch
This branch
All branches
Author SHA1 Message Date
Josh
cbdce9912d Fix typo in networking.md 
Minor typo fix
 2014-06-20 07:14:56 -04:00
James Turnbull
4e286a9094 Merge pull request #6548 from jamtur01/sec 
Fixed #6545 - Updated Security article
 2014-06-19 20:21:07 -05:00
Victor Vieux
8554841c6a Merge pull request #6563 from vieux/merge_release_v1.0.1 
Merge release v1.0.1
 2014-06-19 18:09:07 -07:00
Victor Vieux
49376ec448 Change version to 1.0.1-dev 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-20 01:06:48 +00:00
Victor Vieux
7030cdce59 Merge pull request #6559 from vieux/bump_v1.0.1 
Bump v1.0.1
 2014-06-19 18:03:54 -07:00
Victor Vieux
990021ac2b Bump version to v1.0.1 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-19 23:11:34 +00:00
Victor Vieux
41d405fa53 Merge pull request #6557 from crosbymichael/update-libcontainer-1.0.1 
Update libcontainer dep to v1.0.1
 2014-06-19 15:43:30 -07:00
Michael Crosby
8d06bfc12e Update libcontainer dep to v1.0.1 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-06-19 15:23:19 -07:00
Tianon Gravi
98ea12ac38 Merge pull request #6554 from tianon/fix-dyntest 
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
 2014-06-19 16:04:24 -06:00
Victor Vieux
7ba8788919 Merge pull request #6527 from subhraveti/cap-whitelist 
Maintain a whitelist of capabilities rather than droplist
 2014-06-19 14:48:38 -07:00
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
Tianon Gravi
986a151b8a Fix dyntest and rename it to dyntest-unit to match the test-unit rename 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-06-19 15:06:34 -06:00
Michael Crosby
abda245ddc Merge pull request #6493 from vieux/fix_cp_mac_os 
allow utimes on mac os, only lutimes isn't supported
 2014-06-19 14:00:59 -07:00
Tibor Vass
4ad5af81c8 Merge pull request #6552 from vbatts/vbatts-gh6551 
sqlite-3.6.20-1 unique constraint message
 2014-06-19 16:54:43 -04:00
Michael Crosby
707ef9618b Update close fd issues for lxc 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-06-19 16:02:21 -04:00
Michael Crosby
d31ae5aed8 Use libcontainer cap drop method 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-06-19 16:00:53 -04:00
Vincent Batts
b4857dffa8 sqlite-3.6.20-1 unique constraint message 
https://github.com/dotcloud/docker/issues/6551

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-06-19 15:24:22 -04:00
Tianon Gravi
2eac1c4bc5 Merge pull request #6547 from tianon/update-bash-completion-for-pushing-tags 
Update bash-completion to reflect ability to push single tags
 2014-06-19 12:40:31 -06:00
Tianon Gravi
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
James Turnbull
346a350df4 Merge pull request #6538 from leeplay/patch-2 
Update dockerlinks.md
 2014-06-19 10:59:48 -05:00
unclejack
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
James Turnbull
874698cb4a Merge pull request #6524 from behemphi/patch-1 
Update dockerizing.md
 2014-06-19 07:06:02 -05:00
cyphar
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
cyphar
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
hyeongkyu.lee
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
Dinesh Subhraveti
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
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
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
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