docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Omer Katz
0d32970ba2 Added a help wanted note for SkyDNS and SkyDNS2. 2014-08-07 10:54:37 +03: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
Aanand Prasad
0a15e7fe9c Merge pull request #378 from orchardup/use-ruby-image-for-rails-tutorial 
Use ruby image for rails docs
 2014-08-06 16:51:04 -07:00
Aanand Prasad
255b9419dd Merge pull request #382 from orchardup/use-official-repositories-in-django-example 
Use official images in Django example
 2014-08-06 16:50: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
Aanand Prasad
c63947b5e2 Merge pull request #383 from orchardup/use-official-repos-on-homepage 
Use official repos on home page
 2014-08-06 16:40:48 -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
Ben Firshman
b5d1979d58 Use official repos on home page 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 16:33:31 -07:00
Ben Firshman
94aa097bc3 Use official images in Django example 
Much neater.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 16:30:27 -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
Aanand Prasad
72ce7ce374 Merge pull request #380 from orchardup/use-hostname-for-redis-on-home-page-example 
Use hostname on home page example
 2014-08-06 16:11:44 -07:00
Ben Firshman
6d64f20ad6 Use hostname on home page example 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 15:53:45 -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
Ben Firshman
506f54e9c3 Use ruby image for rails docs 
Fixes #376

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 13:42:56 -07: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
Solomon Hykes
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
Solomon Hykes
92105ea0fa Remove unused field from engine.Job 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-06 17:56:12 +00:00
Solomon Hykes
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
Solomon Hykes
61eab75939 Extra testing for engine.Shutdown 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-06 17:56:12 +00:00
Solomon Hykes
78f0a914ee Replace Server.IsRunning with Engine.IsShutdown 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-06 17:56:11 +00:00
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
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
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
Solomon Hykes
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
Solomon Hykes
fa27580cff Move "import" to graph/import.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-06 17:18:50 -04:00
Solomon Hykes
f2029f7be1 Move "load" to graph/load.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-06 17:18:50 -04:00
Solomon Hykes
77781440f1 Move "viz" to graph/viz.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-06 17:18:50 -04:00
Solomon Hykes
51dd68d659 Move "images" to graph/list.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-06 17:18:50 -04:00
Solomon Hykes
55235e121e Move "image_history" to graph/history.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-06 17:18:50 -04:00
Solomon Hykes
6e28d11d1f Move "image_export" to graph/export.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-06 17:18:50 -04:00