clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 17:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,960 Commits 9 Branches 112 Tags
a110ce2f284d09df3e047b1999a1535770433d5f
Commit Graph
9960 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Solomon Hykes a110ce2f28 Rename a method for clarity 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-10 04:33:19 +00:00
Solomon Hykes 5e9b3727b8 Move declaration of DockerCli to top of file for readability 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-10 04:31:59 +00:00
Michael Crosby 2c90fde982 Merge pull request #7449 from shykes/cleanup-shutdown 
Cleanup: refactor shutdown and signal handling facility
 2014-08-08 19:39:51 -07:00
Tianon Gravi 93da07a8dc Merge pull request #7492 from crosbymichael/update-libcontainer-aug3 
Update libcontainer to f2e78425c377acc7a67a35c3148
 2014-08-08 17:44:13 -06:00
Michael Crosby 983b4fc3bf Merge pull request #7475 from erikh/fix_hostname_parsing 
fix parsing of hostnames when we actually want IP addresses.
 2014-08-08 16:40:50 -07:00
Michael Crosby c74e8b544d Update libcontainer to f2e78425c377acc7a67a35c3148 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-08 16:12:35 -07:00
Erik Hollensbe 99a864431d First stab at nat tests. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-08 15:01:12 -07:00
Erik Hollensbe 3c49cb17fb fix parsing of hostnames when we actually want IP addresses. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-08 15:01:10 -07:00
Hollie Teal 2dc21af70b Merge pull request #7406 from hollietealok/docs_add 
Added "Github Submodules" section to Automated Builds doc.
 2014-08-08 09:40:42 -07:00
James Turnbull fb650d1e6d Merge pull request #7465 from flavio/update-opensuse-doc 
Updated openSUSE's installation instructions
 2014-08-08 11:28:27 -04:00
Tibor Vass 7dbab337dd Merge pull request #7479 from shykes/cleanup-server-info 
Cleanup: move "info" to daemon/info.go
 2014-08-08 09:34:14 -04:00
Flavio Castelli 90e97960fa 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)
 2014-08-08 12:36:20 +02:00
James Turnbull 33d6b20c13 Merge pull request #7278 from Toebez/patch-1 
Update nodejs_web_app.md
 2014-08-07 23:16:37 -04:00
Solomon Hykes 94715e8e64 Move "info" to daemon/info.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-08 03:01:55 +00:00
Sven Dowideit 0ca010695c 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
 2014-08-08 12:10:01 +10:00
Solomon Hykes 09ad385f64 Merge pull request #7458 from jamtur01/cg 
Update CONTRIBUTING.md
 2014-08-07 18:45:51 -07:00
Tianon Gravi 2767509894 Merge pull request #7476 from tianon/sysvinit-status-of-proc 
Fix several minor issues with Debian sysvinit script
 2014-08-07 19:30:42 -06:00
Michael Crosby 414ccee23a Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation 
Revert --stop/--kill and use SIGKILL instead
 2014-08-07 16:47:25 -07:00
Michael Crosby 5d9cfde0df Merge pull request #7453 from shykes/new-subsystem-maintainers 
Add maintainers to daemon/ and graph/
 2014-08-07 16:43:41 -07:00
Tianon Gravi 478fdaf933 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>
 2014-08-07 16:45:22 -06:00
Tibor Vass 860ab469cc Merge pull request #7473 from tianon/pwaller-authors 
Update .mailmap with a few more addresses
 2014-08-07 18:26:49 -04:00
unclejack b36f630817 Merge pull request #7304 from unclejack/refactor_build_tests 
integration cli: minor refactor of the build tests
 2014-08-08 01:24:51 +03:00
Brian Goff 95f86da641 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)
 2014-08-07 18:20:43 -04:00
Michael Crosby 01022a305d Merge pull request #7405 from LK4D4/indicate_run_volume_test_pass 
Print about "copy volume content" test passing
 2014-08-07 15:09:41 -07:00
Michael Crosby bc9f5cdeb5 Merge pull request #7329 from erikh/move_broadcastwriter 
Cleanup: utils/broadcastwriter -> pkg/broadcastwriter
 2014-08-07 14:51:42 -07:00
Michael Crosby e907df8d93 Merge pull request #7474 from crosbymichael/testing-import 
Only import "testing" in test packages
 2014-08-07 14:48:00 -07:00
Michael Crosby b386bce1f1 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>
 2014-08-07 14:33:09 -07:00
Tianon Gravi 7a34f13433 Regenerate AUTHORS one more time 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-08-07 15:32:11 -06:00
Peter Waller f8f36ff320 Add a few canonicalized author names 
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
 2014-08-07 15:32:11 -06:00
Peter Waller d687c5b339 Change Peter Waller's canonical e-mail address 
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
 2014-08-07 15:32:11 -06:00
Peter Waller 7d78dc33b1 Run hack/generate-authors.sh 
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
 2014-08-07 15:32:11 -06:00
Peter Bourgon b87daf6d69 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)
 2014-08-07 14:25:21 -07:00
Tibor Vass ab3e34e187 Merge pull request #7389 from tianon/replace-amd64-build-tags-with-cgo-as-appropriate 
Replace amd64 build tags with cgo as appropriate
 2014-08-07 16:24:19 -04:00
Tianon Gravi 45a239c168 Merge pull request #7413 from cpuguy83/7319_use_blackfriday_not_pandoc_for_manfile_gen 
Use pure go markdown processor to generate man files
 2014-08-07 14:23:49 -06:00
Michael Crosby 140e6abb17 Merge pull request #7443 from ewindisch/name-id-lookup-reversal 
Container name lookups to prefer IDs over names
 2014-08-07 11:14:47 -07:00
Tianon Gravi abbfc7e828 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
 2014-08-07 12:11:50 -06:00
Brian Goff dc296903f0 Merge pull request #7446 from cpuguy83/cleanup_extract_bindmount_spec_parsing 
Cleanup: extract bindmount spec parsing
 2014-08-07 11:48:07 -04:00
Brian Goff 3f136dc0e0 Use pure go markdown processor to generate man files 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-08-07 07:06:39 -04:00
satoru 6e0f072e36 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>
 2014-08-07 15:06:09 +08:00
James Turnbull 8891bb52de Update CONTRIBUTING.md 
Added link to community guidelines
 2014-08-07 02:23:00 -04:00
Solomon Hykes 7e12911f62 Merge pull request #7452 from shykes/7370-on-7427 
Cleanup: move image management and logging out of deprecated Server
 2014-08-06 18:47:45 -07:00
Erik Hollensbe bd373712d0 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)
 2014-08-06 16:45:04 -07:00
Erik Hollensbe 5cdb9c8aca utils.Debugf -> log.Printf, move jsonlog to own package. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-06 16:39:01 -07:00
Erik Hollensbe 5ab09f2f71 utils/broadcastwriter -> pkg/broadcastwriter 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-06 16:37:01 -07:00
Tianon Gravi 89ec17d113 Replace "amd64" build tags with "cgo" as appropriate, and remove where unnecessary 
Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-08-06 17:20:21 -06:00
Michael Crosby bc684fae64 Merge pull request #7430 from tamsky/docfixes 
style, grammar, spelling fixes.
 2014-08-06 16:11:52 -07:00
Michael Crosby e86d87e1ce Merge pull request #7431 from tamsky/fixes-7105 
add warning re: changing value of `dm.basesize`.
 2014-08-06 15:22:42 -07:00
Tianon Gravi 8733cd7c0b Merge pull request #7428 from crosbymichael/update-libcontainer-aug2 
Update libcontainer to 5589d4d879f1d7e31967a927d3e
 2014-08-06 15:41:35 -06:00
Brian Goff f34679d0a9 Cleanup: extract bindmount spec parsing 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-08-06 17:22:40 -04:00
unclejack c9ca37dfe9 Merge pull request #7448 from tiborvass/fix-tmpdir-integration-tests 
Fix tmpdir integration tests
 2014-08-06 23:54:09 +03:00