p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,994 Commits 2 Branches 295 Tags
beca1cc741e43b1520002aa0cd01f51450c8faab
Commit Graph

8994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
beca1cc741 Update libcontainer dep to v1.0.1 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 8d06bfc12ec62b8276b2db22e049d40dde016c9f
Component: engine
 2014-06-19 15:23:19 -07:00
Tianon Gravi
9254e8e818 Merge pull request #6554 from tianon/fix-dyntest 
Fix dyntest and rename it to dyntest-unit to match the test-unit rename
Upstream-commit: 98ea12ac3864239127ae3a9d2aa2d93a72aa5e61
Component: engine
 2014-06-19 16:04:24 -06:00
Victor Vieux
cd49e29a76 Merge pull request #6527 from subhraveti/cap-whitelist 
Maintain a whitelist of capabilities rather than droplist
Upstream-commit: 7ba8788919bf6ddb5de626f3b1b89c497eed4b86
Component: engine
 2014-06-19 14:48:38 -07:00
Tianon Gravi
d1de6bfa90 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)
Upstream-commit: 986a151b8afe59b33097235a5964f78fc1a55521
Component: engine
 2014-06-19 15:06:34 -06:00
Michael Crosby
5d2f394b9a Merge pull request #6493 from vieux/fix_cp_mac_os 
allow utimes on mac os, only lutimes isn't supported
Upstream-commit: abda245ddc38200b6ad24f79d194e6f4125a0100
Component: engine
 2014-06-19 14:00:59 -07:00
Tibor Vass
b7d9a978a2 Merge pull request #6552 from vbatts/vbatts-gh6551 
sqlite-3.6.20-1 unique constraint message
Upstream-commit: 4ad5af81c8394011b63b427a1328a472b615b233
Component: engine
 2014-06-19 16:54:43 -04:00
Michael Crosby
16f6e09488 Update close fd issues for lxc 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 707ef9618b3b26a0534a0af732a22f159eccfaa5
Component: engine
 2014-06-19 16:02:21 -04:00
Michael Crosby
1316dc9e2d Use libcontainer cap drop method 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: d31ae5aed80eeb40a461930776ad2b507804bf4e
Component: engine
 2014-06-19 16:00:53 -04:00
Vincent Batts
3557a3b077 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)
Upstream-commit: b4857dffa8ba0a7b2fe779a0b2264ce1b0b2e7ff
Component: engine
 2014-06-19 15:24:22 -04:00
Tianon Gravi
d94d81180e Merge pull request #6547 from tianon/update-bash-completion-for-pushing-tags 
Update bash-completion to reflect ability to push single tags
Upstream-commit: 2eac1c4bc5e3b77a99d94811cc481bc27b648ee0
Component: engine
 2014-06-19 12:40:31 -06:00
Tianon Gravi
a9640bbe8b Update bash-completion to reflect ability to push single tags 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: bdf4b74b52cb313a869a0b15d1eb315a79e1cd52
Component: engine
 2014-06-19 10:11:32 -06:00
James Turnbull
2f32938e9d Merge pull request #6538 from leeplay/patch-2 
Update dockerlinks.md
Upstream-commit: 346a350df4a9f8b6dac25d2b341fcc84139a46ad
Component: engine
 2014-06-19 10:59:48 -05:00
unclejack
041fa8eb57 Merge pull request #6451 from cyphar/6445-fix-onbuild-passing-to-grandchildren 
Ensure that ONBUILD triggers aren't committed to grandchildren
Upstream-commit: 181e54bff3ecc6ea8d27910d52b4aea2709c42c2
Component: engine
 2014-06-19 18:11:33 +03:00
James Turnbull
76247f5a34 Merge pull request #6524 from behemphi/patch-1 
Update dockerizing.md
Upstream-commit: 874698cb4aaf10d7c1efe91bc15982e4d8c30c20
Component: engine
 2014-06-19 07:06:02 -05:00
cyphar
11e34c9ae0 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)
Upstream-commit: a57298791c882a2a065989b3386b5b14084e8639
Component: engine
 2014-06-19 20:33:17 +10:00
cyphar
8e5f8dab9b 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)
Upstream-commit: 7303467c771cc98f0efcdf8cbb2e0538ad496b72
Component: engine
 2014-06-19 20:33:17 +10:00
hyeongkyu.lee
5d3e706c66 Update dockerlinks.md 
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
Upstream-commit: 7b1f34d6269b7076dda86e0288b906f553f19bd1
Component: engine
 2014-06-19 18:45:31 +09:00
Dinesh Subhraveti
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
James Turnbull
228f6d739b Merge pull request #6519 from fredlf/latest-copyedits 
Copy edits to dockerhub.md, fixed a broken link.
Upstream-commit: b1c114c3a779ab1d2655169b83f5a165483602bc
Component: engine
 2014-06-19 01:45:20 -05:00
Tianon Gravi
3da48c6ff1 Merge pull request #6427 from tianon/fix-zsh-completion-mode 
Fix mode on contrib/completion/zsh/_docker (-x)
Upstream-commit: b13cdb01bdc471e442acba6d86595807824ce67f
Component: engine
 2014-06-18 23:01:07 -06:00
Tianon Gravi
5768bbc295 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)
Upstream-commit: f619243099a384a499fb92ed1065cb4cb87ce3ea
Component: engine
 2014-06-18 22:59:20 -06:00
Boyd Hemphill
f26f8ec5a7 Update dockerizing.md 
Upstream-commit: a84115206928efd8e506641d2f8f31d136a05041
Component: engine
 2014-06-18 22:50:56 -05:00
Solomon Hykes
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
Fred Lifton
e5b30f5226 Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl) 
Upstream-commit: 8646bf4a403aa5333d00d0cea27e2dabe242146f
Component: engine
 2014-06-18 17:50:24 -07:00
Tibor Vass
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
Sven Dowideit
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
O.S. Tezer
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
Sven Dowideit
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
Victor Vieux
2784f63639 discard ErrNotSupportedPlatform 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b132e7b36d30a116fa50eb5035c85cc895cc3d5b
Component: engine
 2014-06-18 23:42:22 +00:00
Victor Vieux
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
Victor Vieux
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
Victor Vieux
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
O.S. Tezer
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
Victor Vieux
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
Michael Crosby
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
Michael Crosby
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
Tibor Vass
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
Rick van de Loo
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
Tibor Vass
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
cyphar
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Victor Vieux
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
Michael Crosby
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
Michael Crosby
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
LK4D4
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
Michael Crosby
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
Tibor Vass
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
James Turnbull
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