unclejack
2a3b91e3b6
docs - add example for cidfile
2013-07-19 16:03:45 +03:00
unclejack
221ee504aa
docs - add cidfile flag to run docs
2013-07-19 16:03:45 +03:00
unclejack
64e74cefb7
add support for container ID files (a la pidfile)
2013-07-19 16:03:45 +03:00
Guillaume J. Charmes
d6fb313220
Merge pull request #1207 from crosbymichael/819-use-persistent-volume
...
* Runtime: Do not overwrite container volumes from config
2013-07-18 18:51:00 -07:00
Daniel Mizyrycki
0aa2470c76
Merge pull request #1232 from dotcloud/1217-testing-coverage
...
Testing, issue #1217 : Add coverage testing into docker-ci
2013-07-18 14:27:37 -07:00
Victor Vieux
edc68f84f3
Merge pull request #1230 from dotcloud/switch_dev
...
switch version to -dev
2013-07-18 13:50:40 -07:00
Victor Vieux
0089dd05e9
switch version to -dev
2013-07-18 20:50:04 +00:00
Victor Vieux
51f6c4a737
Merge pull request #1227 from dotcloud/bump_0.5.0
...
Bump to 0.5.0
2013-07-18 11:51:29 -07:00
Andy Rothfusz
f4eaec3e1e
Merge pull request #1226 from metalivedev/easydockerfile
...
Make dockerfile docs easier to find. Clean up formatting.
2013-07-18 10:14:22 -07:00
Victor Vieux
b083418257
change -b -> -v and add udp example
2013-07-18 16:25:14 +00:00
Victor Vieux
5794857f7a
Merge pull request #1169 from crosbymichael/buildfile-tests
...
Add unit tests for buildfile config instructions
2013-07-18 08:35:23 -07:00
Michael Crosby
e7f3f6fa5a
Add unit tests for buildfile config instructions
...
Add tests for instructions in the buildfile that
modify the config of the resulting image.
2013-07-18 05:37:28 -09:00
Andy Rothfusz
aa5671411b
Make dockerfile docs easier to find. Clean up formatting.
2013-07-17 18:56:40 -07:00
Victor Vieux
f8dfd0aa5e
Merge pull request #1225 from dotcloud/hotfix_docker_rmi
...
*Runtime: improve docker rmi via id
2013-07-17 14:31:56 -07:00
Andy Rothfusz
3dbf9c6560
Merge pull request #1219 from metalivedev/docs-repoupdate
...
Update docs with 0.5 repository information.
2013-07-17 13:53:12 -07:00
Guillaume J. Charmes
de563a3ea3
Merge pull request #1194 from crosbymichael/build-verbose
...
* Builder: Add verbose output to docker build
2013-07-17 12:53:06 -07:00
Victor Vieux
9cf2b41c05
change rm usage in docs
2013-07-17 19:24:54 +00:00
Victor Vieux
f310b875f8
Merge branch 'master' of https://github.com/kencochrane/docker into kencochrane-master
2013-07-17 19:23:06 +00:00
Solomon Hykes
ac14c463d5
Changed date on changelog
2013-07-17 11:51:26 -07:00
Guillaume J. Charmes
578e888915
Merge pull request #1212 from dotcloud/merge_v_b_options
...
* Runtime: Merge -b and -v options
2013-07-17 11:43:47 -07:00
Victor Vieux
5231bf3653
Merge pull request #1222 from lopter/master
...
Always stop the opposite goroutine in network_proxy.go (closes #1213 )
2013-07-17 11:40:33 -07:00
Solomon Hykes
8af945f353
Small changes in changelog wording
2013-07-17 11:39:38 -07:00
Ken Cochrane
d0e8ca1257
updated with notes from @vieux
2013-07-17 13:46:11 -04:00
Victor Vieux
5a934fc923
fix docker rmi via id
2013-07-17 15:48:53 +00:00
Louis Opter
c766d064ac
Always stop the opposite goroutine in network_proxy.go ( closes #1213 )
2013-07-17 01:05:11 -07:00
Andy Rothfusz
0356081c0a
Update repository information.
2013-07-16 17:04:41 -07:00
Daniel Mizyrycki
6e8bfc8d12
Testing, issue #1217 : Add coverage testing into docker-ci
2013-07-16 13:45:43 -07:00
Guillaume J. Charmes
18e91d5f85
Update docs
2013-07-16 10:14:21 -07:00
Guillaume J. Charmes
1004d57b85
Hotfix: make sure ./utils tests pass
2013-07-15 17:58:23 -07:00
Nick Stinemates
f9e4ef5eb0
Merge pull request #1210 from dotcloud/improve_configmerge
...
improve mergeconfig, ...
2013-07-15 18:04:12 -07:00
Guillaume J. Charmes
eefbadd230
Merge -b and -v options
2013-07-15 17:51:32 -07:00
Guillaume J. Charmes
bc21b3ebf0
Bump version to 0.5.0
2013-07-15 14:57:52 -07:00
Solomon Hykes
608fb2a21e
Merge pull request #1184 from dotcloud/1176-packaging-release
...
Hack: document PPA release step
2013-07-15 13:59:55 -07:00
Michael Crosby
92cbb7cc80
Do not overwrite container volumes from config
...
Fixes #819 Use same persistent volume when a container is restarted
2013-07-15 11:59:11 -09:00
Solomon Hykes
45050d9887
Merge pull request #1188 from dotcloud/1174-packaging-binary
...
Packaging: add pure binary to docker release
2013-07-15 13:59:06 -07:00
Daniel Mizyrycki
75a0052e64
packaging, issue #1176 : Document PPA release step
2013-07-15 12:13:51 -07:00
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
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
Michael Crosby
5ae8c7a985
Copy VolumesRW values when using --volumes-from
...
Fixes #1201
2013-07-14 18:23:20 -09: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
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