docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
5,871 Commits 12 Branches 297 Tags
efeecbbbfbefb3285c1903ade7ff702ca858d73e
Commit Graph

5871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Mizyrycki
72d4396796 packaging, issue #1176: Document PPA release step 
Upstream-commit: 75a0052e64d0b9cc214cd58ba798863c69f6c5d3
Component: engine
 2013-07-15 12:13:51 -07:00
Guillaume J. Charmes
6a9b073bb8 Merge pull request #1208 from crosbymichael/1201-rw-volumes-from 
- Volumes: Copy VolumesRW values when using --volumes-from
Upstream-commit: c8efd0838430aeeaef15bfd5ef62aecee4cdc603
Component: engine
 2013-07-15 10:59:51 -07:00
Guillaume J. Charmes
ff7fe2dacd Merge pull request #1096 from dotcloud/remove_os_user 
* Runtime: Remove the os.user dependency and manually lookup /etc/passwd instead
Upstream-commit: 454cd147fb6133319ecdcda962b6aa137f28f32a
Component: engine
 2013-07-15 10:19:09 -07:00
Guillaume J. Charmes
08204dd54e Add unit test to check wrong uid case 
Upstream-commit: e41507bde2d87cb9bbb0c328e414a39354dae10e
Component: engine
 2013-07-15 10:05:09 -07:00
Victor Vieux
80066854b8 store both logs in a same file, as JSON 
Upstream-commit: 599f85d4e4362f24dc2850c71a689671122c456b
Component: engine
 2013-07-15 16:17:58 +00:00
Victor Vieux
cb4f99ad54 Merge branch 'master' into new_logs 
Upstream-commit: 5756ba9bc48ef428bd73b9b123807097c1519db0
Component: engine
 2013-07-15 13:57:54 +00:00
Victor Vieux
c3b2bff375 improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace 
Upstream-commit: 193a7e1dc1945bc9988b6205c63db9d2e0578c55
Component: engine
 2013-07-15 13:12:33 +00:00
Jonas Pfenniger
632014a7bf docker.upstart: use the same start/stop events as sshd 
Is probably more solid
Upstream-commit: 0900d3b7a6e94bfa42e3d4ac6dc6f5542f65a9b0
Component: engine
 2013-07-15 11:41:19 +01:00
Jonas Pfenniger
4b7018962a docker.upstart: avoid spawning a sh process 
start script / end script create an intermediate sh process.
Upstream-commit: 24dd50490a027f01ea086eb90663d53348fa770e
Component: engine
 2013-07-15 11:40:35 +01:00
Michael Crosby
6fdf5346ea Copy VolumesRW values when using --volumes-from 
Fixes #1201
Upstream-commit: 5ae8c7a98592f83a31f3f45fc22728e45e95626c
Component: engine
 2013-07-14 18:23:20 -09:00
benoitc
f2d0413152 reuse the type 
Upstream-commit: d639f61ec1c80f8d8d65386ec9331dbb6e218cb0
Component: engine
 2013-07-13 19:19:38 +02:00
Victor Vieux
f58c6a0202 Merge pull request #1200 from ToothlessGear/fix-whitespaces_progessbar 
Fix progressbar, without messing up other outputs
Upstream-commit: 9b57f9187b84c5cdb92cb50271988aa4c51e8b95
Component: engine
 2013-07-13 08:50:50 -07:00
Victor Vieux
4e2ad07ebe Merge pull request #1190 from dotcloud/1189-add_debug_error 
* RemoteAPI: Improve debug
Upstream-commit: 50e45b485ff61901faec1d79889d801bca7daae1
Component: engine
 2013-07-13 08:15:59 -07:00
Victor Vieux
89d632a562 Merge pull request #1198 from dotcloud/fix_pull_tag 
Fixed tag option for "docker pull" (the option was ignored)
Upstream-commit: 2051ebc0eb1d43cc66037dddc9202e9f1c44b676
Component: engine
 2013-07-13 08:14:47 -07:00
benoitc
913ca03001 useless function. forgot to remove it. 
Upstream-commit: a3b1a9f01a1c08c63e6c37945414481176817ba6
Component: engine
 2013-07-13 17:04:04 +02:00
benoitc
2ad516346a useless type 
Upstream-commit: 507cef8bcea5b56d25d34ca7073c46f608962f19
Component: engine
 2013-07-13 17:03:04 +02:00
benoitc
48162573ba put the websocket route in the map containing all routes 
Instead of handling the websocket differently just handle it as a normal
route and upgrade it to a websocket.
Upstream-commit: 166eba3e28cc440e06e97ed1bda5b1c3881d46da
Component: engine
 2013-07-13 17:00:40 +02:00
Solomon Hykes
1aa0235482 Hack: use helper functions in tests for less copy-pasting 
Upstream-commit: 080243f0407a90cdacf128dc3b53a802549d7797
Component: engine
 2013-07-12 17:56:55 -07:00
Guillaume J. Charmes
26198a8a13 Merge pull request #1054 from nickstenning/getimage-by-tag 
* Runtime: Reverse priority of tag lookup in TagStore.GetImage
Upstream-commit: 933b9d44e1a0c1626b15e6a2d5a051db334d8a27
Component: engine
 2013-07-12 16:15:04 -07:00
Nick Stenning
54ca7a355c Reverse priority of tag lookup in TagStore.GetImage 
Currently, if you have the following images:

    foo/bar      1       23b27d50fb49
    foo/bar      2       f2b86ec3fcc4

And you issue the following command:

    docker tag foo/bar:2 foo/bar latest

docker will tag the "wrong" image, because the image id for foo/bar:1 starts
with a "2". That is, you'll end up with the following:

    foo/bar      1       23b27d50fb49
    foo/bar      2       f2b86ec3fcc4
    foo/bar      latest  23b27d50fb49

This commit reverses the priority given to tags vs. image ids in the
construction `<user>/<repo>:<tagOrId>`, meaning that if a tag that is an exact
match for the specified `tagOrId`, it will be tagged in preference to an image
with an id that happens to start with the correct character sequence.
Upstream-commit: 44b3e8d51b655d68d0a253c48c027360ff8c3a97
Component: engine
 2013-07-12 23:56:36 +01:00
Daniel Mizyrycki
8b3fabeb5f Merge pull request #1083 from hukeli/debian 
Keep debian package up-to-date
Upstream-commit: 9bf8ad741ff3a0f5130d5ad0e0b6c4e99ab31892
Component: engine
 2013-07-12 15:24:37 -07:00
Daniel Mizyrycki
9da4e15f2e Merge pull request #1203 from dotcloud/1202-packaging-debian 
Packaging, issue #1202: Upgrade vagrantfile go in debian packaging
Upstream-commit: 9913ebbe2153d2c2de2396f10f3da9dfa1c66343
Component: engine
 2013-07-12 15:11:57 -07:00
Daniel Mizyrycki
969d894058 Packaging, issue #1202: Upgrade vagrantfile go in debian packaging 
Upstream-commit: c7a48e91d8d31a8b80b46f4cb17d866e36147ddc
Component: engine
 2013-07-12 15:06:12 -07:00
Solomon Hykes
3cd7f4b75d Merge pull request #1195 from dotcloud/tests-cleanup 
* Hack: tests cleanup
Upstream-commit: 2cbf2200ac7ba7e3ae79ed8a85a3cfcdf1026efd
Component: engine
 2013-07-12 14:51:59 -07:00
Marcus Farkas
51c31b8a66 *Client: Fix the progressbar, without manipulating other outputs 
Prior this commit, 'docker images' and other cmd's, which used utils.HumanSize(),
showed unnecessary whitespaces.
Formatting of progress has been moved to FormatProgess(), justifing the string
directly in the template.
Upstream-commit: bac5772312d1fe733511febd117e9f29ff19c698
Component: engine
 2013-07-12 20:15:25 +02:00
Marcus Farkas
23db3e215b Revert "Client: better progressbar output" 
This reverts commit 3ac68f1966222d9a1c0ff867515e3f5c2f83e422.
Upstream-commit: a6e5a397bd6b7967a91f1d7cbe581e46211964da
Component: engine
 2013-07-12 20:08:45 +02:00
Ken Cochrane
aa8559ee18 updated the rmi command docs, the had typos 
Upstream-commit: 364f48d6c7386874ee3fa0696b7a466f76fcf698
Component: engine
 2013-07-12 14:05:26 -04:00
Ken Cochrane
f649b0a057 updated the help commands on a few commands that were not correct 
Upstream-commit: 4174e7aa7a6600a2cfedd1c568000556cf1daf79
Component: engine
 2013-07-12 13:55:26 -04:00
Guillaume J. Charmes
014efc77a7 Remove the os.user dependency and manually lookup /etc/passwd instead 
Upstream-commit: eb38750d99d4f9706cb2abcb861c84e1d309bd40
Component: engine
 2013-07-12 10:49:47 -07:00
Sam Alba
c8bc9a992c Fixed tag option for "docker pull" (the option was ignored) 
Upstream-commit: cd0fef633c5d871b192146e405ca7c5bebb2f3ba
Component: engine
 2013-07-12 10:42:54 -07:00
Michael Crosby
3442b5e984 Add param to api docs for verbose build output 
Upstream-commit: d0c73c28df5627bc7158fd54860f6751b4dab0f9
Component: engine
 2013-07-12 06:22:56 -09:00
Victor Vieux
6ed4740f8b Merge pull request #1197 from crosbymichael/buildfile-doc-ordering 
Fix Docker Builder documentation section numbers
Upstream-commit: 8e6c249e485a8cce37dbfb6b897730bca8bbdca8
Component: engine
 2013-07-12 05:27:47 -07:00
Victor Vieux
5d09c440fb Merge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature 
* Client: Add options to docker login to be able to use it via script
Upstream-commit: 752f99e8a18a5e16f2a93b0fac1984b3a4412346
Component: engine
 2013-07-12 05:07:25 -07:00
Victor Vieux
e7310096d4 Merge pull request #1102 from dotcloud/1098-store_hostconfig_tmp 
* Runtime: bind mounts are now preserved upon container restart
Upstream-commit: a909223ee2c062a26e533c1c7663fa113c942831
Component: engine
 2013-07-12 05:04:10 -07:00
Victor Vieux
a1035172cd Merge pull request #1192 from dotcloud/docker_port-fix 
hotfix: fix broken docker port
Upstream-commit: 8ff271fc742f21c4532f469e06e9f48498f23e8e
Component: engine
 2013-07-12 04:57:53 -07:00
Victor Vieux
318bacb03a Merge pull request #1055 from dotcloud/list_container_processes-feature 
* RemoteApi: /top to list running processes in a container
* Client: docker top to list running processes in a container
Upstream-commit: 9dfac1dd65291af23354b685a60086023bea6907
Component: engine
 2013-07-12 04:56:12 -07:00
Victor Vieux
ac70e7d7db fix tests regarding the new test image 
Upstream-commit: a8a6848ce0c3c54d00cfcd85727546e54a4dcf7e
Component: engine
 2013-07-12 11:54:53 +00:00
Victor Vieux
c22c23bfc2 Merge branch 'master' into list_container_processes-feature 
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
 2013-07-12 11:47:27 +00:00
Victor Vieux
18c42253ef use http://get.docker.io/latest 
Upstream-commit: e9011122fbc4c65afe235a75ca8197ce4fd23753
Component: engine
 2013-07-12 11:45:40 +00:00
Michael Crosby
6a215f8175 Fix Docker Builder documentation numbering 
Upstream-commit: 90483dc9123d6cb9eb1aa1bf4ba4e851d751784e
Component: engine
 2013-07-11 16:41:19 -09:00
Solomon Hykes
6c9e32ae32 Simplify unit tests code with mkRuntime() 
Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b
Component: engine
 2013-07-11 17:59:25 -07:00
Solomon Hykes
b91cb2c854 Don't leave broken, commented out tests lying around. 
Upstream-commit: 2ac11419806ce39c57d5caf6b41a66e5ddf45bc8
Component: engine
 2013-07-11 17:58:45 -07:00
Michael Crosby
89646a08c9 Revert changes from PR 1030 
With streaming output of the build
changes in 1030 are no longer required.
Upstream-commit: 1104d443cc49fd2a6b9c94a2c9724468f9860799
Component: engine
 2013-07-11 15:52:08 -09:00
Michael Crosby
7bf5a45cfe Fix buildfile tests after rebase 
Upstream-commit: 49044a96089487b9df075fa972e83e4c05c7fae8
Component: engine
 2013-07-11 15:37:26 -09:00
Guillaume J. Charmes
725d76d0d9 Hotfix: check the length of entrypoint before comparing. 
Upstream-commit: 71d2ff494694d7f18310c7994daa34dce33af98b
Component: engine
 2013-07-11 17:31:07 -07:00
Michael Crosby
015f243412 Add verbose output to docker build 
Verbose output is enabled by default and
the flag -q can be used to suppress the verbose output.
Upstream-commit: 474191dd7bca9eedaccb9de1771eecfce7dfebbb
Component: engine
 2013-07-11 15:27:33 -09:00
Guillaume J. Charmes
900f657bd8 Merge pull request #1124 from crosbymichael/buildfile-volumes 
+ Builder: Add VOLUME instruction to buildfile
Upstream-commit: 637eceb6a797df45b99f3ea929f7900e75e5fc97
Component: engine
 2013-07-11 17:16:57 -07:00
Victor Vieux
5d58cdd260 change output 
Upstream-commit: 976428f505b64a51efbd97f71acff5db2f4f5ed0
Component: engine
 2013-07-11 21:04:23 +02:00
Victor Vieux
ba109b6d9a fix broken docker port 
Upstream-commit: affe7caf78288a638df3db37d5cebb4dc7f9ff72
Component: engine
 2013-07-11 19:28:15 +02:00
Victor Vieux
750c01d0af wip 
Upstream-commit: 941e3e2ef09092306a7a287ce62b6fb518af9c56
Component: engine
 2013-07-11 17:18:28 +00:00