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
Michael Crosby
90da088491
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
2014-08-06 13:35:46 -07:00
Tibor Vass
872db07119
Fix integration tests by adding DOCKER_TMPDIR env in the test init function
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 15:55:50 -04:00
Tianon Gravi
fba37a038d
Update vendor with the updated canonical deps from libcontainer
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-06 13:19:41 -06:00
Tianon Gravi
5101173e1f
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>
2014-08-06 13:18:24 -06:00
Tibor Vass
5e20b0027c
Fix TestBuildForbiddenContextPath after TMPDIR change
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 14:24:00 -04:00
unclejack
66c8f87e89
Merge pull request #6456 from rhatdan/tmpdir
...
Docker should use /var/lib/docker/tmp for large temporary files.
2014-08-06 20:31:46 +03:00
Eric Windisch
231e07ded4
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>
2014-08-06 13:09:11 -04:00
Solomon Hykes
5240e5f713
Add maintainers to daemon/ and graph/
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 10:29:15 +00:00
Solomon Hykes
1c11d7f93e
Rename "log_event" to "log"
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 10:08:23 +00:00
Alexandr Morozov
8d056423f8
Separate events subsystem
...
* Events subsystem merged from `server/events.go` and
`utils/jsonmessagepublisher.go` and moved to `events/events.go`
* Only public interface for this subsystem is engine jobs
* There is two new engine jobs - `log_event` and `subscribers_count`
* There is auxiliary function `container.LogEvent` for logging events for
containers
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
[solomon@docker.com: resolve merge conflicts]
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 10:08:19 +00:00
Tibor Vass
af0781974d
Check error returned by eng.Register() in TagStore.Install()
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 17:19:01 -04:00
Tibor Vass
69f9d488dc
Move some integration tests to integration-cli
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 17:18:51 -04:00
Solomon Hykes
d787937957
Move "image_tag" and "tag" to graph/tag.go
...
Note: these 2 jobs should be merged into one. This was noted in a FIXME.
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:51 -04:00