1
0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Commit Graph

378 Commits

Author SHA1 Message Date
Michael Crosby
d332e70646 Merge pull request #3153 from vieux/improve_docker_push_display
Update docker push to use new display
Upstream-commit: bd292759f03688cfa22f885572cae6e5cbfc4d77
Component: engine
2013-12-11 11:11:53 -08:00
Michael Crosby
5cde259caa Merge pull request #2735 from shykes/engine-job-kill
New engine command: 'kill'
Upstream-commit: 5fd3c8204de3a8188097add6a75ca70536e1375a
Component: engine
2013-12-11 10:35:57 -08:00
Victor Vieux
f1ea4ce449 Merge pull request #3113 from shykes/engine-export
Move 'docker export' to the engine API
Upstream-commit: 0025e9bd719b1cd8314543019ed8e6f6bc5c57cd
Component: engine
2013-12-10 13:28:24 -08:00
Victor Vieux
879ab073ea update docker push to use [====> ]
Upstream-commit: 95f061b408eafbf981450d3fdb26ebc3188cba4a
Component: engine
2013-12-10 10:57:16 -08:00
Victor Vieux
8644761a3b Merge pull request #3119 from shykes/engine-version
Port 'docker version' to the engine API
Upstream-commit: 09d2c2351c4b016d57f979990698838a94173ec4
Component: engine
2013-12-09 17:35:44 -08:00
Solomon Hykes
707fb0bfad Port 'docker version' to the engine API
Upstream-commit: de35b346d17ef86ef091e1736575c60c41fc3771
Component: engine
2013-12-08 07:41:53 +00:00
Solomon Hykes
d8d9197f34 Cleanup version introspection
* Unify version checking code into version.go
* Make 'version' available as a job in the engine
* Use simplified version checking code when setting user agent for registry client.
Upstream-commit: 869a11bc93c4b5dc9dbd74d65e69045f367bdb36
Component: engine
2013-12-08 07:35:24 +00:00
Solomon Hykes
34b1795f6e Engine: 'export' returns a raw archive of a container's filesystem
Upstream-commit: 9656cdf0c248fda629fe9f13cf4ce4d3fabd35a4
Component: engine
2013-12-08 01:33:37 +00:00
Solomon Hykes
d007e15eed New engine command: 'wait'
Upstream-commit: 3569d080afc721a1eb04ad4a65f1309b53da1238
Component: engine
2013-12-06 23:05:21 +00:00
Solomon Hykes
17c91d08c7 Engine: port 'kill' to the new integer status.
Upstream-commit: 427bdb60e73ad059e813babd981168ea2464ea1f
Component: engine
2013-12-06 23:02:27 +00:00
Solomon Hykes
4c9354ea8f gofmt
Upstream-commit: 9b1930c5a07fe3f696ec54f5d429b8020cc9086f
Component: engine
2013-12-06 23:02:27 +00:00
Solomon Hykes
18f68039b6 Engine: new command 'kill' sends a signal to a running container
Upstream-commit: fdb3de7b11e4b85ec86f76aad51290730c037668
Component: engine
2013-12-06 23:02:27 +00:00
Victor Vieux
1181340954 wait on pull from another client
Upstream-commit: fb810b54ff404e81bd2486a944e24583a55fe8bf
Component: engine
2013-12-05 14:41:56 -08:00
Victor Vieux
f1ec7415d1 Merge pull request #2917 from codeaholics/2698-only-tag-top-layer
Only tag the top-most layer when pushing to a registry
Upstream-commit: a8e99d923507e245f933599c94a061bfdc375452
Component: engine
2013-12-05 10:02:57 -08:00
Victor Vieux
3f773fbd23 Merge pull request #2966 from andrewsmedina/govet2
fixed some `go vet` issues.
Upstream-commit: 5f55c1aee1a6acdce35f5d7be776104d66e44483
Component: engine
2013-12-04 17:57:10 -08:00
Victor Vieux
0624a140ec fix offline image transfert
Upstream-commit: be282b57d561bdb7e686ed8d4f7b6327e7a65b70
Component: engine
2013-12-04 11:55:42 -08:00
Victor Vieux
8eac8d89db remove unused parameter in Download
Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832
Component: engine
2013-12-04 11:54:11 -08:00
shin-
37888fa7b4 Use basic auth for private registries when over HTTPS.
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
Upstream-commit: 045989e3d824f577cd90a6386b66a5814e703766
Component: engine
2013-12-03 16:32:13 +01:00
Victor Vieux
f20cc21995 Merge pull request #2957 from creack/handle_sigquit
Catch SIGQUIT for cleanup
Upstream-commit: 67c03552f65e912550295e1dfc9498055ddd3ac9
Component: engine
2013-12-02 12:13:07 -08:00
Michael Crosby
92e4ac1dc3 Merge pull request #2945 from dotcloud/refactor_stream
Refactor stream
Upstream-commit: e1414a4c3999362c97ad66ed1dd9cd64678df9af
Component: engine
2013-12-02 10:31:09 -08:00
Guillaume J. Charmes
9ddc2663be Merge branch 'master' into handle_sigquit
Conflicts:
	server.go
Upstream-commit: 4e030c78d21f01c3b15e0f360ab7ffcf53918bea
Component: engine
2013-11-29 18:51:32 -08:00
Andrews Medina
26d7cf1b0c fixed some go vet issues.
Upstream-commit: a6c9a332d040a98c5cf4325491fc8d9aa7e5475b
Component: engine
2013-11-29 22:53:20 -02:00
Solomon Hykes
b0f24a88da Engine: integer job status, improved stream API
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
Upstream-commit: a4f8a2494b0fb755db52c68cf61ddc8ff52d2965
Component: engine
2013-11-30 00:25:46 +00:00
Guillaume J. Charmes
96f59dc91d Catch SIGQUIT for cleanup
Upstream-commit: db7c55ba7f97358f3a6de2b83c8e3d1827667446
Component: engine
2013-11-29 14:13:00 -08:00
Guillaume J. Charmes
beebec13c7 Merge pull request #2929 from pnasrat/2928-fix-signal-handling
Remove incorrect SIGKILL handler.
Upstream-commit: 0d3f4017cfa8cd77dd0122dfb23a6d192218c335
Component: engine
2013-11-29 14:10:46 -08:00
Victor Vieux
bc039de754 Merge pull request #2941 from codeaholics/2940-invalid-registry-calls
Stop invalid calls to Registry
Upstream-commit: cca9e51f5d9747dc03830f0c255543a0c9137cc3
Component: engine
2013-11-28 17:00:22 -08:00
Victor Vieux
ee50ddf929 split in 3 files
Upstream-commit: 597e0e69b4c8521f39691d0a07d1f31b7116a337
Component: engine
2013-11-28 12:16:57 -08:00
Victor Vieux
9eafea47b6 Merge pull request #2913 from pnasrat/2852-deleteimage-performance
Performance of deleteImageAndChildren.
Upstream-commit: 377817db1b2fadf9c4294d8356aa7c75eb12e83a
Component: engine
2013-11-28 11:20:43 -08:00
Danny Yates
752dcb1a87 Stop invalid calls to Registry
This code was resulting in a call for
/v1/images/<namespace>/<repository>/ancestry which the Registry
doesn't understand. Furthermore, it was masking the original
error.
Upstream-commit: d47507791e14908e78cf38d415a9863c9ef75c5e
Component: engine
2013-11-28 16:43:28 +00:00
Paul Nasrat
62f27e0053 Remove incorrect SIGKILL handler.
As per POSIX signal handling SIGKILL does not work.

Fixes #2928
Upstream-commit: bdfe8ed403591022ac46371798783c7bbe6134c9
Component: engine
2013-11-28 10:42:06 -05:00
Danny Yates
cfe7ccd294 Only tag the top-most layer, not all interim layers
Upstream-commit: d1a631cedb24c7c75affde7041d43217db64e5c0
Component: engine
2013-11-27 22:00:58 +00:00
Paul Nasrat
d103214bb0 Performance of deleteImageAndChildren.
Don't walk the file system for parents each time we recurse.

Fixes #2852
Upstream-commit: 4e826e99b278ef3cc438553e958727397b4d9ee7
Component: engine
2013-11-27 12:55:15 -05:00
Danny Yates
a17dc473b7 Handle the case where poolAdd() gives an error for an unknown pool type
Upstream-commit: 788feab3a7de44a4749e5a861e3b6f778aa4088b
Component: engine
2013-11-27 16:53:36 +00:00
Danny Yates
55a368beae Allow multiple clients to pull the same tag simultaneously
If two clients simultaneously try to pull the same tag, there was a race
whereby one would succeed and the second would generate an error. Now,
the second simply waits for the first to complete.
Upstream-commit: ae474e05f553c7abefc8674148e2a84a417bbf64
Component: engine
2013-11-27 12:18:01 +00:00
Guillaume J. Charmes
020e2aed63 Merge branch 'master' into use_utc_time
Conflicts:
	image.go
Upstream-commit: 19df6c32c03a649795415bcdf2fd062715557be1
Component: engine
2013-11-25 19:01:13 -08:00
Solomon Hykes
acc5196685 Merge pull request #2609 from shykes/0.6.5-dm-plugin
Move aufs to a storage driver, add devicemapper and dummy drivers
Upstream-commit: 1d903da6fd89b0322f76bc91c07fd3dbe4d22099
Component: engine
2013-11-25 18:58:26 -08:00
Paul Nasrat
f0926e8de2 Fix data race in TestLogEvent
Found with -race. Improve locking on Server.
Upstream-commit: abfdaca3f86d7951693697fbd849078d6b406478
Component: engine
2013-11-25 14:17:58 -05:00
Michael Crosby
627f045fff Merge branch 'master' into 0.6.5-dm-plugin
Upstream-commit: e69bbd239ee8dc4bdc0963810448d9f34e4c30c4
Component: engine
2013-11-22 14:06:59 -08:00
Michael Crosby
7c2bc2f42b Merge pull request #2769 from vbatts/none_bridge
Do not setup bridge ip if 'none' bridge is provided
Upstream-commit: d4c8fb9ee27222e4d33b616bd63ea7863e0064ee
Component: engine
2013-11-22 11:48:33 -08:00
Michael Crosby
cf914fd88c Merge branch 'master' into 0.6.5-dm-plugin
Conflicts:
	container.go
	image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
eec0335af0 Use UTC for time
Upstream-commit: 806abe90ba38741707f58e98ecdcdd4bc19f52e2
Component: engine
2013-11-21 16:43:36 -08:00
Michael Crosby
b82d2b8801 Merge pull request #2798 from dotcloud/fix_state_race
Refactor State to be 100% thread safe
Upstream-commit: 25e443a3c7f55d5ccfb1f5a96c427bd50b978f4d
Component: engine
2013-11-21 16:39:50 -08:00
Guillaume J. Charmes
915356af08 Refactor State to be 100% thread safe
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
2013-11-21 16:34:58 -08:00
Michael Crosby
0e00966e8f Merge pull request #2678 from cxmcc/minor
Minor code simplification for Containers api
Upstream-commit: d6e6214d37499977110e05d5d01cbf25dcae878f
Component: engine
2013-11-21 16:27:15 -08:00
Michael Crosby
8c720af218 Merge pull request #2488 from viirya/fix_container_volumes_delete
Skip the volumes mounted when deleting the volumes of container.
Upstream-commit: 70f1bd31041f9207ae06be5fe2680152eb154047
Component: engine
2013-11-21 16:20:22 -08:00
Guillaume J. Charmes
e859413830 Merge pull request #2763 from dotcloud/use_full_id_delete
Do ont truncate ID on docker rmi
Upstream-commit: 42c23b0f048b417bd233bef3f57e529102ae1177
Component: engine
2013-11-21 14:39:38 -08:00
Paul Morie
f8ba7a65e3 Fix typo in pullImage
Upstream-commit: 3f17844b6ec3edb981653ca237d085909d5be671
Component: engine
2013-11-21 17:29:03 -05:00
Michael Crosby
a3c4139aad Update ImageExport after merge fail
Upstream-commit: 253214f07da1a58931e6a256c351105eb2eee8bc
Component: engine
2013-11-21 10:26:21 -08:00
Michael Crosby
ebbbc781a4 Merge branch 'master' into 0.6.5-dm-plugin
Upstream-commit: a2c9d2da93e5106b82e8f3951947a90508a8f430
Component: engine
2013-11-21 10:21:30 -08:00
Michael Crosby
10c7f84432 Allow images to be saved and loaded by id and repository
Upstream-commit: fd7ab143bf1ecfbf20df90edd876f73dc28c264d
Component: engine
2013-11-20 17:28:19 -08:00