6c1679864e
Move integration tests to integration/, expose missing public methods in the core
...
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
2013-11-14 10:50:00 -08:00
5c6b4b612c
Merge pull request #2648 from dotcloud/docker_kill_exit_code
...
Make sure docker kill exit with failure in case of error
Upstream-commit: 388057f11a20fd8b4bfd7d1b0d9f0cb18a72afa8
Component: engine
2013-11-12 14:40:17 -08:00
b17fc3fb8e
Merge pull request #2657 from dotcloud/fix_docker_images_output
...
use utils.ParseRepositoryTag instead of strings.split in docker images
Upstream-commit: dcc9980550d46ca43878566f00d5259fce05b1ca
Component: engine
2013-11-12 11:01:29 -08:00
111d9154c1
Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert
...
Conflicts:
server.go
Upstream-commit: b314f19db8f2180292691f20f28783042b80495e
Component: engine
2013-11-12 10:19:29 -08:00
b55bba158e
add wait, stop, start, restart, rm, rmi
...
Upstream-commit: e2ac0e6b806c094fd8a3b706653623c0c2aee861
Component: engine
2013-11-11 14:47:23 -08:00
a30846b548
use utils.ParseRepositoryTag instead of strings.split in docker images
...
Upstream-commit: 84a3600ea82d1a3ea235f1193092206c1f0c011a
Component: engine
2013-11-11 13:54:17 -08:00
a52e1003c4
Make sure docker kill exit with failure in case of error
...
Upstream-commit: 8149439d956489a551f9e197ca2adbae85e78ff0
Component: engine
2013-11-11 09:15:51 -08:00
5090a5bd4b
Make "docker insert" errors obvious
...
Closes #1130
See also #1942
Upstream-commit: 5957dd909134fc3c3dc3e165b83559feb89d9f5b
Component: engine
2013-11-08 00:15:19 -06:00
600bb37cb7
Deprecate old tagging format
...
Upstream-commit: ef57752bce5c333d0e2b8352a84d071f21cce132
Component: engine
2013-11-07 17:30:51 -08:00
d03901e0ad
Closes #2328 - allow the user to specify a string timestamp (not just a unix epoch) in the string format that the docker cli shows to the user
...
Upstream-commit: 01fea3cf116b768720b542ab65cbd1c2695848d0
Component: engine
2013-11-08 09:32:13 +10:00
a16746b24c
Merge pull request #1794 from justone/add-images-tree
...
add -tree option to images
Upstream-commit: 807a305f36c54d54a20109992f4f301b62ae0081
Component: engine
2013-11-06 16:12:36 -08:00
d677b4b873
Merge pull request #2334 from SvenDowideit/2149-small-cli-usability-change
...
change ID to CONTAINER ID/IMAGE ID
Upstream-commit: 45aba3dc959d867147fedc8e8ac578d2acfb4d79
Component: engine
2013-11-06 09:45:23 -08:00
e9a1f4f7ff
add image size to -tree
...
Upstream-commit: b7d1d35c278c57ad4732dc23e529cf771158ee96
Component: engine
2013-11-06 04:23:07 +00:00
2dbd3407de
implement "images -tree"
...
Upstream-commit: ec9a9a08b8b76079207ced5b55a7caade27fb3d3
Component: engine
2013-11-06 03:58:16 +00:00
cbbaa36a2b
move "images -viz" to client
...
Upstream-commit: 2a5998baf172f94a8d6866e46207a0d7d75e70e5
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
b64b038b00
Merge pull request #2460 from SvenDowideit/2294-use-repo-colon-tag-everywhere
...
covert docker (commit|import|tag) to use REPOSITORY[:TAG]
Upstream-commit: 962a66cd36a615bb0a7cb9866becdccf4aa97839
Component: engine
2013-11-05 10:29:54 -08:00
22e1fc60ec
Merge pull request #2382 from dotcloud/reflect_future_changes_search_api
...
Update docker search to reflect future changes of the api
Upstream-commit: a482bfd715c6c33603ee5fbdc27693c942dbef93
Component: engine
2013-11-04 16:14:14 -08:00
4dd237b1bf
remove column size hack
...
Upstream-commit: 854cc5f55992b8bb200f470b11896a0b3cb68d4e
Component: engine
2013-11-04 15:34:51 -08:00
39f858c891
Fix logs with tty
...
Upstream-commit: 1f44fd8624d1de3f7e1e55880352faef2e141fb1
Component: engine
2013-11-04 12:19:20 -08:00
d38ad81595
tiny table heading tweak for #2149 - change ID to CONTAINER ID/IMAGE ID or IMAGE (the later if it could be an ID or a repo:tag
...
Upstream-commit: b840b73b08a4f491d0eb8b5a05302342b8bc9242
Component: engine
2013-11-04 22:10:51 +10:00
8c3f937eb2
conert docker (commit|import|tag) to use REPOSITORY[:TAG] (and repove support for REPOSITORY TAG)
...
Upstream-commit: 1f3cdc11ee0c7088c8619f8b31bcd17ce8b79b79
Component: engine
2013-11-04 22:07:55 +10:00
698f7cfe59
Merge pull request #2503 from dotcloud/2500-inspect-fix
...
Client: Inspect fix
Upstream-commit: fc455351977157e7e833d1a5ad3ce48dbf545501
Component: engine
2013-11-01 15:24:05 -07:00
cbce82a91e
Merge pull request #2457 from dotcloud/2454_do_not_split_last_column
...
RemoteAPI: Do not split last column docker top
Upstream-commit: 8f27e23b4b28406e7cde47ea74d56232c935208c
Component: engine
2013-11-01 15:21:47 -07:00
47ebac600d
rebase and add some filters
...
Upstream-commit: 747967b4a4e2bfa429a76d20db77b990d23b1a0f
Component: engine
2013-10-31 19:25:55 -07: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
b0e7dd34da
fix inspect error message
...
Upstream-commit: a89a98e59432109d99c08b43f670df7429145172
Component: engine
2013-10-31 18:50:58 -07:00
42fe9c53e7
fix inspect when it returns nothing valid
...
Upstream-commit: 40ed10cc32fe6dbf18d13a43d42a1a9bed0df902
Component: engine
2013-10-31 18:39:44 -07:00
fb9771da9e
Move archive.go to sub package
...
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
2013-10-31 16:57:45 -07:00
a162db7be1
Merge pull request #2432 from SvenDowideit/doc-stop-kill-details
...
IRC: add SIGTERM and SIGKILL details to docker stop and kill docco
Upstream-commit: 4b8a176ee0f5df3d7f29f7995f38c700330468b1
Component: engine
2013-10-30 18:57:07 -07:00
67b88fd430
Add flags to history, add size flag
...
Upstream-commit: 1099d172a2f083c456c3564d403e666e965a9544
Component: engine
2013-10-30 19:41:20 -05:00
1f8c72b79c
do not split last column docker top
...
Upstream-commit: fb4672c52c050ce08c7432d2d149e37b0056e8f6
Component: engine
2013-10-29 19:03:41 -07:00
a59c312632
stop proxy at one point
...
Upstream-commit: 700a71e6b62a3786d11719ae30cacd0f90930525
Component: engine
2013-10-29 14:29:01 -07:00
c452ed1a32
Enable sig-proxy by default in run and attach
...
Upstream-commit: e0b59ab52b87b8fc15dd5534c3231fdd74843f9f
Component: engine
2013-10-29 11:18:34 -07:00
ed387ea493
docker stop sends SIGTERM and SIGKILL, docker kill sends SIGKILL
...
Upstream-commit: 82f15148955124c20cb756502036c4f231e5a8aa
Component: engine
2013-10-29 13:37:43 +10:00
c2ea5a00ce
Merge pull request #2162 from dotcloud/links
...
Links and Container Naming
Upstream-commit: b038b0cd44e152fa4158f2bfe145de6d774dd8d0
Component: engine
2013-10-28 19:24:10 -07: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
95fff601cd
fix docker ps display
...
Upstream-commit: d5c7e92a9a8ba65e1b2aad0f21393e8986d03d55
Component: engine
2013-10-25 17:36:23 -07:00
98b1505702
only pass stdin to hijack when needed
...
Upstream-commit: 13c521526ddc88e2502d9fe331faef51fe747cd2
Component: engine
2013-10-25 17:17:33 -07:00
20cc4c2b5a
update docker port command
...
Upstream-commit: 66a159342bfa1b2bb8361f21a17279aa0417bb50
Component: engine
2013-10-25 15:13:25 -07:00
5b0bbe7633
remove docker ls and add docker link in usage and switch to go1.2rc2
...
Upstream-commit: 6c863b49ef9de8f203c84f7e2e55f33deeb10bdb
Component: engine
2013-10-25 15:13:25 -07:00
83a034fdc4
no more name encoding
...
Upstream-commit: 256b7537e332c68d0fa35b60e06726c40ed66312
Component: engine
2013-10-25 15:13:25 -07:00
0caf5bff97
refactor notrunc in commands.go to add names support
...
Upstream-commit: 387aeb78fb1f518a3c8982d73701f5b7faa1c59c
Component: engine
2013-10-25 15:13:24 -07:00
cd17fb7c91
Move ListOps to utils submodule
...
This will be needed for later use in docker-init without a docker
dependency
Upstream-commit: d063c8d941d366e4815b91c4fa4fc91fc1e1eb23
Component: engine
2013-10-25 15:13:24 -07:00
f85e0d3aec
Remove docker ls from docs and cli usage
...
Upstream-commit: 515070d5138c205e65cd029443c84408ad593ef6
Component: engine
2013-10-25 15:13:24 -07:00
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
116fed86d5
Merge pull request #1963 from rogpeppe/master
...
Client: Use less reflection in command-line method invocation
Upstream-commit: 31111f61e05afc625ea82f8751b31df08bd75c2d
Component: engine
2013-10-24 18:03:20 -07:00
c79d5e702c
change logic for tty resize to avoid warning in tests
...
Upstream-commit: 0e44864b666b5b0139cdf8ec5a001fee661bf212
Component: engine
2013-10-24 14:54:04 -07:00
f1c190c4d6
monitor the tty after starting the container
...
Upstream-commit: 656b66e51b18ff9f5f2720c3ce9ff9ec2937f05f
Component: engine
2013-10-24 11:19:06 -07:00
1050f660ec
Merge pull request #2279 from dotcloud/fix_docker_inspect
...
Client: improve docker inspect
Upstream-commit: b0515a7016d9be58e989401f65645af756d904ef
Component: engine
2013-10-22 17:17:35 -07:00
