toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,804 Commits 3 Branches 295 Tags
ddec0cfa1640501530e2e808bcc4268eb02dba97
Commit Graph

20395 Commits

Author SHA1 Message Date
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
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
Solomon Hykes
a74b20717e Engine.Shutdown only waits 5 seconds for active jobs to complete 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: eb79dc14fe45f3805d83e5e5e64b335da6389d6a
Component: engine
 2014-08-06 17:56:12 +00:00
Solomon Hykes
145b9864d4 Remove unused field from engine.Job 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 92105ea0fa774607ea4c7f487aedfd22eb5598bc
Component: engine
 2014-08-06 17:56:12 +00:00
Solomon Hykes
90ba5c6273 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>
Upstream-commit: 20b0841c1bd07c6add812597e0d656d7584e48ac
Component: engine
 2014-08-06 17:56:12 +00:00
Solomon Hykes
f56c09a5b4 Extra testing for engine.Shutdown 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 61eab759397a0915a0dd69de399d49d2a0ed0ba6
Component: engine
 2014-08-06 17:56:12 +00:00
Solomon Hykes
812a1a7ed4 Replace Server.IsRunning with Engine.IsShutdown 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 78f0a914ee982126793534286682e6c6e4270e97
Component: engine
 2014-08-06 17:56:11 +00:00
Solomon Hykes
c8882ce911 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>
Upstream-commit: b4efcd53e0a62a8ce1080e94e28358ac1a2d6ae2
Component: engine
 2014-08-06 17:56:11 +00:00
Solomon Hykes
727879ad53 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>
Upstream-commit: c9f3fd3fc7a4beb97de40ef8da7330b23397d9d3
Component: engine
 2014-08-06 17:56:11 +00:00
Solomon Hykes
73ece46978 Move signal handling code to pkg/signal.Trap 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: d55e3fea72efb2ae24e4fe1781bbe9002846f4d3
Component: engine
 2014-08-06 17:56:11 +00:00
Solomon Hykes
d8f9865870 Subsystems can register cleanup handlers with Engine.OnShutdown 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: d745067487fe2a750cfa2625ed7f652a56abc17c
Component: engine
 2014-08-06 17:56:11 +00:00
Tianon Gravi
c27845ab5c Merge pull request #7492 from crosbymichael/update-libcontainer-aug3 
Update libcontainer to f2e78425c377acc7a67a35c3148
Upstream-commit: 93da07a8dc2b33e161d279fef35e2470e8beafaf
Component: engine
 2014-08-08 17:44:13 -06:00
Michael Crosby
d487159628 Update libcontainer to f2e78425c377acc7a67a35c3148 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: c74e8b544defeca8fb215a2295066e10f91bedda
Component: engine
 2014-08-08 16:12:35 -07:00
Erik Hollensbe
0fdb50d077 First stab at nat tests. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 99a864431d7eb29840edb7aed78cb361eea7d6ac
Component: engine
 2014-08-08 15:01:12 -07:00
Erik Hollensbe
819d34fe2e fix parsing of hostnames when we actually want IP addresses. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3c49cb17fb6014519925a069ad81c30ff41b3d7f
Component: engine
 2014-08-08 15:01:10 -07: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
Solomon Hykes
c3b263a99f Add maintainers to daemon/ and graph/ 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 5240e5f71380b68792abcd3cf54283385ec7a4f0
Component: engine
 2014-08-06 10:29:15 +00:00
Solomon Hykes
a40eb6a232 Rename "log_event" to "log" 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 1c11d7f93e2070c94ad22dfec3336eb1cd548280
Component: engine
 2014-08-06 10:08:23 +00:00
Alexandr Morozov
a195939eec 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>
Upstream-commit: 8d056423f8c433927089bd7eb6bc97abbc1ed502
Component: engine
 2014-08-06 10:08:19 +00:00
Tibor Vass
3c48cb561a Check error returned by eng.Register() in TagStore.Install() 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: af0781974df54f2c4959ea1d90c3f43b9ae37799
Component: engine
 2014-08-06 17:19:01 -04:00
Tibor Vass
9075da38d2 Move some integration tests to integration-cli 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 69f9d488dc915d8b02827658ccc5a7c48136dc03
Component: engine
 2014-08-06 17:18:51 -04:00
Solomon Hykes
7b8c4dce89 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>
Upstream-commit: d7879379571e778b30973874df22fed3266cbb8f
Component: engine
 2014-08-06 17:18:51 -04:00
Solomon Hykes
f301b073e0 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>
Upstream-commit: 7a5e3df1625df24d52e2c863706076c59803cff8
Component: engine
 2014-08-06 17:18:50 -04:00
Solomon Hykes
93595da0a6 Move "import" to graph/import.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: fa27580cff5f22bcf2a4860b5582c67d275a0e11
Component: engine
 2014-08-06 17:18:50 -04:00
Solomon Hykes
ffef9dad57 Move "load" to graph/load.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: f2029f7be19c75ccc291608d1bd07bc0de220276
Component: engine
 2014-08-06 17:18:50 -04:00
Solomon Hykes
879d15c342 Move "viz" to graph/viz.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 77781440f13b07caa19c835523cbc6591dc1ffa8
Component: engine
 2014-08-06 17:18:50 -04:00
Solomon Hykes
b81d1a3561 Move "images" to graph/list.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 51dd68d65949b4b542d65e4de2f1b18550c9cff1
Component: engine
 2014-08-06 17:18:50 -04:00
Solomon Hykes
bd46934d5a Move "image_history" to graph/history.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 55235e121eb2924488508f70b8f30e0e9905d85e
Component: engine
 2014-08-06 17:18:50 -04:00
Solomon Hykes
854e47bfb8 Move "image_export" to graph/export.go 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 6e28d11d1fde757cf5b9418a2e752717d854f3f3
Component: engine
 2014-08-06 17:18:50 -04:00
Marc Tamsky
a062aab14b add warning re: changing value of dm.basesize. 
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
Upstream-commit: bd30746e07e18942cea4f2d15a45fd357c957e4f
Component: engine
 2014-08-05 19:28:07 -07:00
Hollie Teal
44d7ee420c Made requested changes (capitalization) 
Upstream-commit: 4d0527856ca4bd0037313f02a3487845af97330e
Component: engine
 2014-08-05 19:06:52 -07:00
Michael Crosby
17e78a7923 Update libcontainer to 5589d4d879f1d7e31967a927d3e 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 6215422286f59530e598b3317c9ea789f8c1d0c7
Component: engine
 2014-08-05 18:13:43 -07:00
Marc Tamsky
88553ea651 style, grammar, spelling fixes. 
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
Upstream-commit: 07099b62563f3201877995181825d4cd4822ed89
Component: engine
 2014-08-05 18:11:32 -07:00
Solomon Hykes
4e14138bbc Merge pull request #7186 from jamtur01/community 
Added proposed Docker Community Guidelines
Upstream-commit: 042b642d407fd9f76c7282fb71e1508bd033bfa1
Component: engine
 2014-08-05 15:44:11 -07:00
Michael Crosby
343e9e6a4a Merge pull request #7412 from bfirsh/rename-docker-config 
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
Upstream-commit: 0ea5160d2aff93f49f4288046de4c92727c2e097
Component: engine
 2014-08-05 14:52:28 -07:00
Dan Walsh
05babb14b7 Docker should use /var/lib/container/tmp for large temporary files. 
/tmp is often a tmpfs file system and large temporary files could cause
docker commands to fail.  Also using /tmp potentially allows users on the
system to get access to content, or even attack the content.  Moving the tmpdir to
/var/lib/container/tmp will protect the data.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)

Conflicts:
	docker/docker.go
Upstream-commit: b4813f2841638be28208b7b1602f12750a46ece9
Component: engine
 2014-08-05 16:43:42 -04:00
Michael Crosby
12ead53494 Merge pull request #6909 from LK4D4/prune_cmd_on_entrypoint_setting_#5147 
Cleanup cmd on entrypoint setting
Upstream-commit: 8f4b477c3263bc11c1ecc837d5a3f9aa663eff1c
Component: engine
 2014-08-05 11:50:18 -07:00