p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,944 Commits 2 Branches 295 Tags
811bdfdcea708eb0661899d64b24bc052576c8b7
Commit Graph

9944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doug Davis
811bdfdcea fix for issue 7281 
add missing comma per O.S. Tezer's commment

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 55dc4f2b94f68e9e1b4e73b1f21cf5151f86e8f8
Component: engine
 2014-08-09 08:11:59 -04:00
Hollie Teal
73581056c0 Merge pull request #7406 from hollietealok/docs_add 
Added "Github Submodules" section to Automated Builds doc.
Upstream-commit: 2dc21af70b764cb7f3984b576fdfa049cad87c6c
Component: engine
 2014-08-08 09:40:42 -07:00
James Turnbull
a4dc156e24 Merge pull request #7465 from flavio/update-opensuse-doc 
Updated openSUSE's installation instructions
Upstream-commit: fb650d1e6d938240c3e2058e3d8dc9eb75128435
Component: engine
 2014-08-08 11:28:27 -04:00
Tibor Vass
974366f036 Merge pull request #7479 from shykes/cleanup-server-info 
Cleanup: move "info" to daemon/info.go
Upstream-commit: 7dbab337dd9f555a8c2653a8a3690496d70eb982
Component: engine
 2014-08-08 09:34:14 -04:00
Flavio Castelli
f9e96cf7d4 Updated openSUSE's installation instructions 
Cover network configuration and reference the official openSUSE image
inside of the examples.

Docker-DCO-1.1-Signed-off-by: Flavio Castelli <fcastelli@suse.com> (github: flavio)
Upstream-commit: 90e97960fa2282189f16b44a8699b3c6ec12e520
Component: engine
 2014-08-08 12:36:20 +02:00
James Turnbull
a345fa1cd7 Merge pull request #7278 from Toebez/patch-1 
Update nodejs_web_app.md
Upstream-commit: 33d6b20c133348fed0d803fbe350b5a663974345
Component: engine
 2014-08-07 23:16:37 -04:00
Solomon Hykes
9a5247f7ee Move "info" to daemon/info.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 94715e8e643f0bc9aa57841b346f5196f75f0dc0
Component: engine
 2014-08-08 03:01:55 +00:00
Sven Dowideit
7b0cf887d4 Merge pull request #7460 from suzaku/fix_docs 
Make it clear that JSON array format should be used if CMD is used as default arguments
Upstream-commit: 0ca010695cc504c1a27cfb939e2580e0515caec1
Component: engine
 2014-08-08 12:10:01 +10:00
Solomon Hykes
1b47516d28 Merge pull request #7458 from jamtur01/cg 
Update CONTRIBUTING.md
Upstream-commit: 09ad385f64b8af06acab61828ac19ead6bd64222
Component: engine
 2014-08-07 18:45:51 -07:00
Tianon Gravi
f57326ceac Merge pull request #7476 from tianon/sysvinit-status-of-proc 
Fix several minor issues with Debian sysvinit script
Upstream-commit: 2767509894e52f7ff28bdd95ccc7737eb6779a1a
Component: engine
 2014-08-07 19:30:42 -06:00
Michael Crosby
722d8e53b5 Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation 
Revert --stop/--kill and use SIGKILL instead
Upstream-commit: 414ccee23a25df258f9496e721dbfb6f1773ea9a
Component: engine
 2014-08-07 16:47:25 -07:00
Michael Crosby
c29fd30ad7 Merge pull request #7453 from shykes/new-subsystem-maintainers 
Add maintainers to daemon/ and graph/
Upstream-commit: 5d9cfde0df1453ccc66c98cabe42dd640fdb79c2
Component: engine
 2014-08-07 16:43:41 -07:00
Tianon Gravi
b1b3c2f243 Fix several minor issues with Debian sysvinit script 
- add `set -e` to make failing commands bail the script
- remove trailing `exit 0` which is just extraneous anyhow
- adjust `status_of_proc` options to pass in `$DOCKER_DESC` so we get consistently styled messages like `Docker is running` or `Docker is not running` or `could not access PID file for Docker`

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 478fdaf93353c70a26c0043dadb650fd2f101c40
Component: engine
 2014-08-07 16:45:22 -06:00
Tibor Vass
cf2dcc43fc Merge pull request #7473 from tianon/pwaller-authors 
Update .mailmap with a few more addresses
Upstream-commit: 860ab469cc267097e243c634fdb59f7444eefea1
Component: engine
 2014-08-07 18:26:49 -04:00
unclejack
081e88cd1a Merge pull request #7304 from unclejack/refactor_build_tests 
integration cli: minor refactor of the build tests
Upstream-commit: b36f6308176ccb44d93704388514fa0041a8584e
Component: engine
 2014-08-08 01:24:51 +03:00
Brian Goff
a79d7ec92b Revert rm -f deprecation use SIGKILL instead 
`rm -f` was originally deprecated in favor of `rm --stop/--kill` since `rm
-f` was sending SIGTERM and potentially very slow.
Instead this will bring back `rm -f` but use SIGKILL isntead

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 95f86da641dfec9b3db88e0f0a8457685361a871
Component: engine
 2014-08-07 18:20:43 -04:00
Michael Crosby
80a9f6e508 Merge pull request #7405 from LK4D4/indicate_run_volume_test_pass 
Print about "copy volume content" test passing
Upstream-commit: 01022a305d7b822ff9740dd0ce992064bffbd4d8
Component: engine
 2014-08-07 15:09:41 -07:00
Michael Crosby
bdc2cfec82 Merge pull request #7329 from erikh/move_broadcastwriter 
Cleanup: utils/broadcastwriter -> pkg/broadcastwriter
Upstream-commit: bc9f5cdeb5c000de5be291a5628d6eb99c1ab91d
Component: engine
 2014-08-07 14:51:42 -07:00
Michael Crosby
0a94b187e4 Merge pull request #7474 from crosbymichael/testing-import 
Only import "testing" in test packages
Upstream-commit: e907df8d93feaf00628eb293bd39a08a66d87222
Component: engine
 2014-08-07 14:48:00 -07:00
Michael Crosby
22832ff041 Graphtest is ok to compile normally 
The graphtest package is only imported in the test files of other
packages therefore we do not leak testing flags.

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: b386bce1f1bc92584282cc3f6656878c05d75272
Component: engine
 2014-08-07 14:33:09 -07:00
Tianon Gravi
024c2cf99d Regenerate AUTHORS one more time 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 7a34f1343372b0712155087a9a5f447b59b60084
Component: engine
 2014-08-07 15:32:11 -06:00
Peter Waller
56a4d87cf4 Add a few canonicalized author names 
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: f8f36ff320d5b14a5fb61ab3fec0b1e7ef1e8aa6
Component: engine
 2014-08-07 15:32:11 -06:00
Peter Waller
ab4c9735de Change Peter Waller's canonical e-mail address 
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: d687c5b3393a22e0db6473f0572a332f211c7102
Component: engine
 2014-08-07 15:32:11 -06:00
Peter Waller
1b6a85626e Run hack/generate-authors.sh 
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
Upstream-commit: 7d78dc33b15c9c5fd4cc2c0c5526cdfd5505ee4f
Component: engine
 2014-08-07 15:32:11 -06:00
Peter Bourgon
b75c55fd72 Only import "testing" from *_test.go 
This prevents the testing package flags from leaking into the flagsets
of binaries that import docker. I left integration-cli alone.

Docker-DCO-1.1-Signed-off-by: Peter Bourgon <peter@bourgon.org> (github: peterbourgon)
Upstream-commit: b87daf6d697655ca092bf54717a64b07504a13c1
Component: engine
 2014-08-07 14:25:21 -07:00
Tibor Vass
456929c3f9 Merge pull request #7389 from tianon/replace-amd64-build-tags-with-cgo-as-appropriate 
Replace amd64 build tags with cgo as appropriate
Upstream-commit: ab3e34e1874872854e93c290990e081e1b202b65
Component: engine
 2014-08-07 16:24:19 -04:00
Tianon Gravi
363a612198 Merge pull request #7413 from cpuguy83/7319_use_blackfriday_not_pandoc_for_manfile_gen 
Use pure go markdown processor to generate man files
Upstream-commit: 45a239c1682e435848b03a34f484879e7bbc0ea7
Component: engine
 2014-08-07 14:23:49 -06:00
Michael Crosby
a4215f0a92 Merge pull request #7443 from ewindisch/name-id-lookup-reversal 
Container name lookups to prefer IDs over names
Upstream-commit: 140e6abb17a85a569416236352a4fb07ce508480
Component: engine
 2014-08-07 11:14:47 -07:00
Tianon Gravi
7366604091 Merge pull request #7423 from tianon/nuclear-_-weapons--we-got-the-bomb 
Add contrib/nuke-graph-directory.sh script to clean out old /var/lib/docker directories much more easily
Upstream-commit: abbfc7e828e380b485bb706c2da3ffaa7c4201f3
Component: engine
 2014-08-07 12:11:50 -06:00
Brian Goff
51a5b1b1f0 Merge pull request #7446 from cpuguy83/cleanup_extract_bindmount_spec_parsing 
Cleanup: extract bindmount spec parsing
Upstream-commit: dc296903f072b8e710954954acecad4ccd4e04b6
Component: engine
 2014-08-07 11:48:07 -04:00
Brian Goff
3c371660e7 Use pure go markdown processor to generate man files 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 3f136dc0e0feb826eb67c2c2d600ee681a16bb02
Component: engine
 2014-08-07 07:06:39 -04:00
satoru
bde3f4cb22 Make it clear that JSON array format should be used if CMD is used as default arguments 
Signed-off-by: Xuecong Liao <satorulogic@gmail.com>
Upstream-commit: 6e0f072e36d7b367bde7b5c34fda9c47f36af2da
Component: engine
 2014-08-07 15:06:09 +08:00
James Turnbull
549f195299 Update CONTRIBUTING.md 
Added link to community guidelines
Upstream-commit: 8891bb52def06aa4fe21af544c6a3a50ecfa9a5b
Component: engine
 2014-08-07 02:23:00 -04:00
Solomon Hykes
30c7baef5a Merge pull request #7452 from shykes/7370-on-7427 
Cleanup: move image management and logging out of deprecated Server
Upstream-commit: 7e12911f62080a5bf2f8da8583eebe95c648da68
Component: engine
 2014-08-06 18:47:45 -07:00
Erik Hollensbe
5247a2be66 port usage of jsonlog to the new daemon files which were refactored 
recently.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: bd373712d069f5f1f8d65bc25808a068a9afdd13
Component: engine
 2014-08-06 16:45:04 -07:00
Erik Hollensbe
325695b856 utils.Debugf -> log.Printf, move jsonlog to own package. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5cdb9c8acab75df74d20cd937e4091dacb355160
Component: engine
 2014-08-06 16:39:01 -07:00
Erik Hollensbe
00eca7c915 utils/broadcastwriter -> pkg/broadcastwriter 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5ab09f2f7129225220fc9c0b76b2e2aec6823ee1
Component: engine
 2014-08-06 16:37:01 -07:00
Tianon Gravi
416ed08d2b Replace "amd64" build tags with "cgo" as appropriate, and remove where unnecessary 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 89ec17d11319ae39bff19985ac59fc878fe1fe1e
Component: engine
 2014-08-06 17:20:21 -06:00
Michael Crosby
c3c811b0a6 Merge pull request #7430 from tamsky/docfixes 
style, grammar, spelling fixes.
Upstream-commit: bc684fae642dbf585215b9518f469634a52a5524
Component: engine
 2014-08-06 16:11:52 -07:00
Michael Crosby
955fb61f46 Merge pull request #7431 from tamsky/fixes-7105 
add warning re: changing value of `dm.basesize`.
Upstream-commit: e86d87e1ce8c67f0463d76f6c438a19c859f1bd3
Component: engine
 2014-08-06 15:22:42 -07:00
Tianon Gravi
2ce4468307 Merge pull request #7428 from crosbymichael/update-libcontainer-aug2 
Update libcontainer to 5589d4d879f1d7e31967a927d3e
Upstream-commit: 8733cd7c0bc1224f9b50e3f9c0c1d86dac3f1add
Component: engine
 2014-08-06 15:41:35 -06:00
Brian Goff
2e8acb9277 Cleanup: extract bindmount spec parsing 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: f34679d0a999eaf370f3544cd1c21b90b8876795
Component: engine
 2014-08-06 17:22:40 -04:00
unclejack
23b10fab8b Merge pull request #7448 from tiborvass/fix-tmpdir-integration-tests 
Fix tmpdir integration tests
Upstream-commit: c9ca37dfe9c6050a290e52cad107bb8d4fd575bf
Component: engine
 2014-08-06 23:54:09 +03:00
Michael Crosby
fa42c6f545 Merge pull request #27 from tianon/update-libcontainer 
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
Upstream-commit: 90da0884913b021b400202d2162aeafe1582f5ad
Component: engine
 2014-08-06 13:35:46 -07:00
Tibor Vass
db456f6481 Fix integration tests by adding DOCKER_TMPDIR env in the test init function 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 872db07119e702424dc27cd6e3396b3f2109c468
Component: engine
 2014-08-06 15:55:50 -04:00
Tianon Gravi
7867156c6c Update vendor with the updated canonical deps from libcontainer 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: fba37a038d6053c272671ebc958b88f023bd221a
Component: engine
 2014-08-06 13:19:41 -06:00
Tianon Gravi
a73db3dc5c Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 5101173e1fa5616768cb7a1b07f6c911f0f63658
Component: engine
 2014-08-06 13:18:24 -06:00
Tibor Vass
ddc4e78a18 Fix TestBuildForbiddenContextPath after TMPDIR change 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 5e20b0027c19efdd83228cbbb9995847cb5cb8ed
Component: engine
 2014-08-06 14:24:00 -04:00
unclejack
a223b80846 Merge pull request #6456 from rhatdan/tmpdir 
Docker should use /var/lib/docker/tmp for large temporary files.
Upstream-commit: 66c8f87e89ba0dd824cf640a159210fbbb8019ec
Component: engine
 2014-08-06 20:31:46 +03:00
Eric Windisch
c1114b1805 Container name lookups to prefer IDs over names 
Lookups of container names should prefer the ID over
names assigned to containers by users.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 231e07ded4debc69422696cacc069a47a77e3175
Component: engine
 2014-08-06 13:09:11 -04:00