b6950e3878
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
2013-11-19 14:58:12 -08:00
6e0c243c2e
Lintify code with confidence=1
...
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
2013-11-18 16:24:11 -08:00
fa730d3073
Print devicemapper status details in docker info
...
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.
The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
Upstream-commit: 243843c0787ce2b56c8bbf72a2d4bd7604e84b2e
Component: engine
2013-11-15 11:04:02 +01:00
fb91dc2f0c
Show active driver in docker info output
...
Upstream-commit: 062810caedba973e76a3dd7eb9e45b56511eefc6
Component: engine
2013-11-15 10:24:48 +01:00
b5c0cbf917
bump api version and ensure backward compat
...
Upstream-commit: d7928b9a673e9b2aff36fa6961481312455c91f4
Component: engine
2013-11-06 03:58:15 +00:00
59c6d98498
rework images JSON
...
Upstream-commit: 15867ff4308c5c1330a400be56410d404336100f
Component: engine
2013-11-06 03:58:15 +00:00
dfa410640a
update docker search to reflect future changes of the api
...
Upstream-commit: 02b52024328996e2028d7d953ef6a9c1e2e50744
Component: engine
2013-10-31 19:14:11 -07:00
67b88fd430
Add flags to history, add size flag
...
Upstream-commit: 1099d172a2f083c456c3564d403e666e965a9544
Component: engine
2013-10-30 19:41:20 -05:00
7ce1e20657
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
0bf56a21bc
use less reflection in command line method invocation
...
Upstream-commit: 181b9badddf3571da395509d152eb244d87b6883
Component: engine
2013-09-23 01:06:31 +01:00
14f3a4d119
Bumped API version in api.go ; added <1.5 behavior to getContainersJSON
...
Upstream-commit: 9ae5054c3477c6eb9afc64ad44ff41bb3f10a8ab
Component: engine
2013-09-04 23:41:44 +02:00
828c933a0c
More descriptive, easier to process container portmappings information in the API
...
Upstream-commit: 98018df07856811536722df84b9558e0efdabdca
Component: engine
2013-08-28 00:20:35 +02:00
c746f1a64f
Add warning when net.ipv4.ip_forwarding = 0
...
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
Upstream-commit: 10190be5d74bc4b13a885f2ba27c2299c868fd19
Component: engine
2013-08-07 18:28:39 -04:00
41cf866a86
Merge pull request #1093 from monnand/910-login-info
...
* Runtime: fixed #910 . print user name to docker info output
Upstream-commit: 65a4e308258f4cd85237adf4934c630e3b8f1039
Component: engine
2013-08-07 15:09:55 -07:00
3ea6442a29
Add cp command and copy api endpoint
...
The cp command and copy api endpoint allows users
to copy files and or folders from a containers filesystem.
Closes #382
Upstream-commit: 5b8cfbe15c29efd3e72ea97ba87867590aeeba25
Component: engine
2013-08-06 16:09:54 +00:00
2eadef5023
Added index address into APIInfo.
...
Upstream-commit: 303490168fb53af2528375ca9ec818c7a179a044
Component: engine
2013-08-05 23:36:55 -04:00
d8352677c8
Merge branch 'master' into 1237-improve_docker_top-feature
...
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
743adaf705
add kernel version
...
Upstream-commit: 6057e6ad70ba4550df358e89b9a7e1da61666604
Component: engine
2013-07-24 13:36:55 +00:00
8d3c08d3c7
bump master
...
Upstream-commit: ca39f15fa3285e86660cc66d2c3e446e12c9ce86
Component: engine
2013-07-24 13:28:01 +00:00
d1efb7843b
basic version of the /events endpoint
...
Upstream-commit: b5da816487d68853a8ac46630cb3118646f71d2d
Component: engine
2013-07-23 15:41:19 +00:00
744c5e7658
add LXC version to docker info in debug mode
...
Upstream-commit: 921c6994b1ad41c940bdb08732225b8db74b68f2
Component: engine
2013-07-19 16:36:23 +00:00
37e3d486fa
add ps args to docker top
...
Upstream-commit: cfec1c3e1b88ceeca73144198df7a210ed3dc421
Component: engine
2013-07-19 10:06:32 +00:00
ab729772a8
change to top
...
Upstream-commit: 11e28842ac74ad0b706d24ec639952f78e9a147c
Component: engine
2013-07-01 15:19:42 +00:00
6657ec16bd
add /proc to list running processes inside a container
...
Upstream-commit: 2e79719622964eb95eca70372ced0ad6e4dce4f5
Component: engine
2013-06-28 15:51:58 +00:00
531f894fab
* API: Send all tags on History API call
...
Upstream-commit: 808faa6371c470fa0765f5d4e3aed7708d8f9ee6
Component: engine
2013-06-18 10:31:07 -07:00
00bc56197b
* API: Add tag lookup to history command. Fixes #882
...
Upstream-commit: 3bfc82257878e55141bb029390574130c3ac0530
Component: engine
2013-06-17 18:39:30 -07:00
730a1370b2
Merge branch 'master' into 22-add_sizes_images_and_containers-feature
...
Upstream-commit: ddf5a1940fdbe2efa7136e7f5f26c2adc1a59b3e
Component: engine
2013-06-14 10:05:06 +00:00
5bf955bfcc
fix virtual size on images
...
Upstream-commit: 00cf2a1fa264c167dff0dd50e296c93d4c59908f
Component: engine
2013-06-14 10:05:01 +00:00
2bcee3140c
rebump
...
Upstream-commit: 66d9a733622ba9a8f9671bac7d33776981672940
Component: engine
2013-06-10 21:05:54 +00:00
fafb25034a
bump to master again
...
Upstream-commit: bf63cb904592e1ca73aa3990c08ea0b752fec14d
Component: engine
2013-06-05 16:01:36 +00:00
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
37b218faec
Improve the docker version and docker info commands
...
Upstream-commit: 1dae7a25b919dc70798cbab8107809690212cd69
Component: engine
2013-05-31 15:53:57 -07:00
799ca20158
added proper returns type, move the auto-prune in v1.1 api
...
Upstream-commit: 9060b5c2f52d29dec1920eb89ee0d48341540e3b
Component: engine
2013-05-31 14:37:02 +00:00
8c3121bf04
bump to master
...
Upstream-commit: 6fce89e60b71ee2306d66003697b6c746c456250
Component: engine
2013-05-22 13:41:29 +00:00
ce120b932a
Move docker build to client
...
Upstream-commit: 0f312113d3ce37d57fb28eb98c8abcdcbfcd39a3
Component: engine
2013-05-19 10:46:24 -07:00
e0c6a8e8bb
add sizes in images and containers
...
Upstream-commit: a91b710961b74341543a81b9d16f66d65b1907f1
Component: engine
2013-05-13 15:14:20 +02:00
ad78d7afdf
removed only_ids and trunc_cmd from the api
...
Upstream-commit: 1990c49a6235530a3ddedc00db3aa38acf93a9c5
Component: engine
2013-05-13 12:18:55 +02:00
b2dbee934e
bump to master
...
Upstream-commit: fc29f01528ef99b88734bee252cc0af05675885e
Component: engine
2013-05-09 02:20:16 +02:00
2a0cf81ee6
fix run no parameter
...
Upstream-commit: 40794113750a3d21e784e2521ae517f23a081135
Component: engine
2013-05-07 20:59:04 +02:00
521aa8b1ce
added search
...
Upstream-commit: 59a6316f5e0810009f5986d62f1707f8d0a6650e
Component: engine
2013-05-07 20:43:31 +02:00
dd754d5d4b
added login and push
...
Upstream-commit: f37399d22baaec0b04de42e4712d50f3edd80444
Component: engine
2013-05-06 13:34:31 +02:00
2c79fdbc57
up to date with master
...
Upstream-commit: 4f0bda2dd5cfe382f7fd9cfb9f5522f42377673b
Component: engine
2013-05-02 18:36:23 +02:00
fa147c676f
refactoring run/attach/logs
...
Upstream-commit: a4bcf7e1ac19dbf4c2e4f65af4addc1bfc47d567
Component: engine
2013-05-02 05:07:06 +02:00
ccf3ea8fbb
[] instead fon null, timetsamps and wip import
...
Upstream-commit: 36b968bb09b72366b21b74439eeba463317d2320
Component: engine
2013-04-30 17:04:31 +02:00
74f09dee81
added commit
...
Upstream-commit: 79512b2a8025184d647de61cdd6a19ebadd17a49
Component: engine
2013-04-24 16:06:30 +02:00
6a51f02794
changed not found errors to 404, added inspect, wait and diff
...
Upstream-commit: 1e357c69690f5325d92ae7c41e396711865382f0
Component: engine
2013-04-24 14:01:40 +02:00
efa5049675
added run (wip), fixed ps and images, added port and tag
...
Upstream-commit: cf19be44a8eb9b790ba3bef29f851dc65cb61c3c
Component: engine
2013-04-23 18:20:53 +02:00
ddf6d0da71
added push hijack (wip)
...
Upstream-commit: 6ce475dbdf97fd5e721a150c58d92d6819e5decb
Component: engine
2013-04-22 23:37:22 +02:00
da599fd557
added: info, history, logs, ps, start, stop, restart, rm, rmi
...
Upstream-commit: b295239de20f15620ee4149fcc7c13ce461cdaac
Component: engine
2013-04-19 15:24:37 +02:00
