docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,720 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

3720 Commits

Author SHA1 Message Date
Guillaume J. Charmes c8efd08384 Merge pull request #1208 from crosbymichael/1201-rw-volumes-from 
- Volumes: Copy VolumesRW values when using --volumes-from
 2013-07-15 10:59:51 -07:00
Guillaume J. Charmes 454cd147fb Merge pull request #1096 from dotcloud/remove_os_user 
* Runtime: Remove the os.user dependency and manually lookup /etc/passwd instead
 2013-07-15 10:19:09 -07:00
Guillaume J. Charmes e41507bde2 Add unit test to check wrong uid case 2013-07-15 10:05:09 -07:00
Victor Vieux 599f85d4e4 store both logs in a same file, as JSON 2013-07-15 16:17:58 +00:00
Victor Vieux 5756ba9bc4 Merge branch 'master' into new_logs 2013-07-15 13:57:54 +00:00
Victor Vieux 193a7e1dc1 improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace 2013-07-15 13:12:33 +00:00
Jonas Pfenniger 0900d3b7a6 docker.upstart: use the same start/stop events as sshd 
Is probably more solid
 2013-07-15 11:41:19 +01:00
Jonas Pfenniger 24dd50490a docker.upstart: avoid spawning a `sh` process 
start script / end script create an intermediate sh process.
 2013-07-15 11:40:35 +01:00
Michael Crosby 5ae8c7a985 Copy VolumesRW values when using --volumes-from 
Fixes #1201
 2013-07-14 18:23:20 -09:00
benoitc d639f61ec1 reuse the type 2013-07-13 19:19:38 +02:00
Victor Vieux 9b57f9187b Merge pull request #1200 from ToothlessGear/fix-whitespaces_progessbar 
Fix progressbar, without messing up other outputs
 2013-07-13 08:50:50 -07:00
Victor Vieux 50e45b485f Merge pull request #1190 from dotcloud/1189-add_debug_error 
* RemoteAPI: Improve debug
 2013-07-13 08:15:59 -07:00
Victor Vieux 2051ebc0eb Merge pull request #1198 from dotcloud/fix_pull_tag 
Fixed tag option for "docker pull" (the option was ignored)
 2013-07-13 08:14:47 -07:00
benoitc a3b1a9f01a useless function. forgot to remove it. 2013-07-13 17:04:04 +02:00
benoitc 507cef8bce useless type 2013-07-13 17:03:04 +02:00
benoitc 166eba3e28 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.
 2013-07-13 17:00:40 +02:00
Solomon Hykes 080243f040 Hack: use helper functions in tests for less copy-pasting 2013-07-12 17:56:55 -07:00
Guillaume J. Charmes 933b9d44e1 Merge pull request #1054 from nickstenning/getimage-by-tag 
* Runtime: Reverse priority of tag lookup in TagStore.GetImage
 2013-07-12 16:15:04 -07:00
Nick Stenning 44b3e8d51b 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.
 2013-07-12 23:56:36 +01:00
Daniel Mizyrycki 9bf8ad741f Merge pull request #1083 from hukeli/debian 
Keep debian package up-to-date
 2013-07-12 15:24:37 -07:00
Daniel Mizyrycki 9913ebbe21 Merge pull request #1203 from dotcloud/1202-packaging-debian 
Packaging, issue #1202: Upgrade vagrantfile go in debian packaging
 2013-07-12 15:11:57 -07:00
Daniel Mizyrycki c7a48e91d8 Packaging, issue #1202: Upgrade vagrantfile go in debian packaging 2013-07-12 15:06:12 -07:00
Solomon Hykes 2cbf2200ac Merge pull request #1195 from dotcloud/tests-cleanup 
* Hack: tests cleanup
 2013-07-12 14:51:59 -07:00
Marcus Farkas bac5772312 *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.
 2013-07-12 20:15:25 +02:00
Marcus Farkas a6e5a397bd Revert "Client: better progressbar output" 
This reverts commit 3ac68f1966.
 2013-07-12 20:08:45 +02:00
Ken Cochrane 364f48d6c7 updated the rmi command docs, the had typos 2013-07-12 14:05:26 -04:00
Ken Cochrane 4174e7aa7a updated the help commands on a few commands that were not correct 2013-07-12 13:55:26 -04:00
Guillaume J. Charmes eb38750d99 Remove the os.user dependency and manually lookup /etc/passwd instead 2013-07-12 10:49:47 -07:00
Sam Alba cd0fef633c Fixed tag option for "docker pull" (the option was ignored) 2013-07-12 10:42:54 -07:00
Michael Crosby d0c73c28df Add param to api docs for verbose build output 2013-07-12 06:22:56 -09:00
Victor Vieux 8e6c249e48 Merge pull request #1197 from crosbymichael/buildfile-doc-ordering 
Fix Docker Builder documentation section numbers
 2013-07-12 05:27:47 -07:00
Victor Vieux 752f99e8a1 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
 2013-07-12 05:07:25 -07:00
Victor Vieux a909223ee2 Merge pull request #1102 from dotcloud/1098-store_hostconfig_tmp 
* Runtime: bind mounts are now preserved upon container restart
 2013-07-12 05:04:10 -07:00
Victor Vieux 8ff271fc74 Merge pull request #1192 from dotcloud/docker_port-fix 
hotfix: fix broken docker port
 2013-07-12 04:57:53 -07:00
Victor Vieux 9dfac1dd65 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
 2013-07-12 04:56:12 -07:00
Victor Vieux a8a6848ce0 fix tests regarding the new test image 2013-07-12 11:54:53 +00:00
Victor Vieux 9232d1ef62 Merge branch 'master' into list_container_processes-feature 2013-07-12 11:47:27 +00:00
Victor Vieux e9011122fb use http://get.docker.io/latest 2013-07-12 11:45:40 +00:00
Michael Crosby 90483dc912 Fix Docker Builder documentation numbering 2013-07-11 16:41:19 -09:00
Solomon Hykes 6bdb6f226b Simplify unit tests code with mkRuntime() 2013-07-11 17:59:25 -07:00
Solomon Hykes 2ac1141980 Don't leave broken, commented out tests lying around. 2013-07-11 17:58:45 -07:00
Michael Crosby 1104d443cc Revert changes from PR 1030 
With streaming output of the build
changes in 1030 are no longer required.
 2013-07-11 15:52:08 -09:00
Michael Crosby 49044a9608 Fix buildfile tests after rebase 2013-07-11 15:37:26 -09:00
Guillaume J. Charmes 71d2ff4946 Hotfix: check the length of entrypoint before comparing. 2013-07-11 17:31:07 -07:00
Michael Crosby 474191dd7b Add verbose output to docker build 
Verbose output is enabled by default and
the flag -q can be used to suppress the verbose output.
 2013-07-11 15:27:33 -09:00
Guillaume J. Charmes 637eceb6a7 Merge pull request #1124 from crosbymichael/buildfile-volumes 
+ Builder: Add VOLUME instruction to buildfile
 2013-07-11 17:16:57 -07:00
Victor Vieux 976428f505 change output 2013-07-11 21:04:23 +02:00
Victor Vieux affe7caf78 fix broken docker port 2013-07-11 19:28:15 +02:00
Victor Vieux 941e3e2ef0 wip 2013-07-11 17:18:28 +00:00
Victor Vieux b7937e268f add debug for error in the server 2013-07-11 12:21:43 +00:00