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
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
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
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
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
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
8891bb52de
Update CONTRIBUTING.md
...
Added link to community guidelines
2014-08-07 02:23:00 -04:00
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
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
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
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
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
bc684fae64
Merge pull request #7430 from tamsky/docfixes
...
style, grammar, spelling fixes.
2014-08-06 16:11:52 -07:00
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
8733cd7c0b
Merge pull request #7428 from crosbymichael/update-libcontainer-aug2
...
Update libcontainer to 5589d4d879f1d7e31967a927d3e
2014-08-06 15:41:35 -06:00
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
c9ca37dfe9
Merge pull request #7448 from tiborvass/fix-tmpdir-integration-tests
...
Fix tmpdir integration tests
2014-08-06 23:54:09 +03:00
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
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
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
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
5e20b0027c
Fix TestBuildForbiddenContextPath after TMPDIR change
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 14:24:00 -04:00
eb79dc14fe
Engine.Shutdown only waits 5 seconds for active jobs to complete
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:56:12 +00:00
92105ea0fa
Remove unused field from engine.Job
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:56:12 +00:00
20b0841c1b
Remove last trace of Daemon->Server dependency
...
This removes a shim `daemon.Server` interface which was used to start
separating Daemon from Server *gradually*, without getting cyclic
dependency errors.
Now that the last Daemon->Server dependency has been removed, we can
finally remove the shim. Yay!
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:56:12 +00:00
61eab75939
Extra testing for engine.Shutdown
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:56:12 +00:00
78f0a914ee
Replace Server.IsRunning with Engine.IsShutdown
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:56:11 +00:00
b4efcd53e0
Remove unnecessary job "initserverpidfile"
...
That job was a hacky solution to a real race condition. This removes the
hack without re-introducing the race.
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:56:11 +00:00
c9f3fd3fc7
Cleanup: refactor shutdown and signal handling facility
...
This disentangles the following functions, which were previously all mixed together:
* 1) Waiting for jobs to terminate when shutting down
* 2) Handling signals in the Docker daemon
* 3) Per-subsystem cleanup handlers
* 4) pidfile management
Responsibilities are dispatched as follows:
* Signal traps are set in `main`, and trigger `engine.Shutdown`
* `engine.Shutdown` coordinates cleanup by waiting for jobs to complete, and calling shutdown handlers
* To perform cleanup at shutdown, each subsystem registers handlers with `engine.OnShutdown`
* `daemon` is one subsystem, so it registers cleanup via `engine.OnShutdown`.
* `daemon` owns the pidfile, which is used to lock access to `/var/lib/docker`. Part of its cleanup is to remove the pidfile.
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:56:11 +00:00
d55e3fea72
Move signal handling code to pkg/signal.Trap
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:56:11 +00:00
d745067487
Subsystems can register cleanup handlers with Engine.OnShutdown
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:56:11 +00:00
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
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
5240e5f713
Add maintainers to daemon/ and graph/
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 10:29:15 +00:00
1c11d7f93e
Rename "log_event" to "log"
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 10:08:23 +00:00
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
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
69f9d488dc
Move some integration tests to integration-cli
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 17:18:51 -04:00
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
7a5e3df162
Move "image_delete" to daemon/image_delete.go
...
Note: this cannot yet be moved to graph/ because of a lingering
dependency on daemon. This has been noted in a FIXME.
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
fa27580cff
Move "import" to graph/import.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
f2029f7be1
Move "load" to graph/load.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
77781440f1
Move "viz" to graph/viz.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
51dd68d659
Move "images" to graph/list.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
55235e121e
Move "image_history" to graph/history.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
6e28d11d1f
Move "image_export" to graph/export.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
bd30746e07
add warning re: changing value of `dm.basesize`.
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
2014-08-05 19:28:07 -07:00
4d0527856c
Made requested changes (capitalization)
2014-08-05 19:06:52 -07:00
6215422286
Update libcontainer to 5589d4d879f1d7e31967a927d3e
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-05 18:13:43 -07:00
07099b6256
style, grammar, spelling fixes.
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
2014-08-05 18:11:32 -07:00
Tianon Gravi
Michael Crosby
Brian Goff
satoru
James Turnbull
Solomon Hykes
Erik Hollensbe
unclejack
Tibor Vass
Eric Windisch
Alexandr Morozov
Marc Tamsky
Hollie Teal