7446d96bad
Merge pull request #1225 from dotcloud/hotfix_docker_rmi
...
*Runtime: improve docker rmi via id
Upstream-commit: f8dfd0aa5e03f3f8819dea6bb59800c90824008c
Component: engine
2013-07-17 14:31:56 -07:00
13dc02d1d8
add VolumesFrom to MergeConfig, and test
...
Upstream-commit: 1a226f0e28e7da4eb3701b31dbe959142c42b752
Component: engine
2013-07-17 21:06:46 +00:00
3e4e3b1c00
Merge pull request #1219 from metalivedev/docs-repoupdate
...
Update docs with 0.5 repository information.
Upstream-commit: 3dbf9c6560fe1741cde9e8e2ce6ac98acf26e8ce
Component: engine
2013-07-17 13:53:12 -07:00
ef71cbddf6
add Volumes and VolumesFrom to CompareConfig
...
Upstream-commit: 7c00201222e29989214b7e8a221b057daba0a27d
Component: engine
2013-07-17 20:51:25 +00:00
fb0bdc7ba8
prevent any kind of operation simultaneously
...
Upstream-commit: 2db99441c85fdf1e7d468bc02b085d9e1b95704c
Component: engine
2013-07-17 20:39:36 +00:00
2b2f5cce76
Merge pull request #1194 from crosbymichael/build-verbose
...
* Builder: Add verbose output to docker build
Upstream-commit: de563a3ea372432acb39e711eeb0b43296754c39
Component: engine
2013-07-17 12:53:06 -07:00
a44b5f6d5b
change rm usage in docs
...
Upstream-commit: 9cf2b41c053d557af6c563311b4953c4b9bab6d6
Component: engine
2013-07-17 19:24:54 +00:00
aa3ed33e67
Merge branch 'master' of https://github.com/kencochrane/docker into kencochrane-master
...
Upstream-commit: f310b875f8972870e87e4395b5dbd8613b66fa39
Component: engine
2013-07-17 19:23:06 +00:00
926b49f016
Changed date on changelog
...
Upstream-commit: ac14c463d55494fdab88d36ea74a4ecef8ab48dc
Component: engine
2013-07-17 11:51:26 -07:00
59f9a15c00
Merge pull request #1212 from dotcloud/merge_v_b_options
...
* Runtime: Merge -b and -v options
Upstream-commit: 578e88891577960bf0961b49a52f494cfc977a5e
Component: engine
2013-07-17 11:43:47 -07:00
76eb7762ab
Small changes in changelog wording
...
Upstream-commit: 8af945f353379a96eb036d67fb24d489c5e16808
Component: engine
2013-07-17 11:39:38 -07:00
28398dc429
updated with notes from @vieux
...
Upstream-commit: d0e8ca1257f7f969a035d3d78b55e08c067e8a20
Component: engine
2013-07-17 13:46:11 -04:00
7d6b6db98e
fix docker rmi via id
...
Upstream-commit: 5a934fc923af316a6e82b9dd11169484b3b744f6
Component: engine
2013-07-17 15:48:53 +00:00
be8eb02780
Always stop the opposite goroutine in network_proxy.go ( closes #1213 )
...
Upstream-commit: c766d064ac6c2183321cb2e47ea8c0b0b2d2d238
Component: engine
2013-07-17 01:05:11 -07:00
2953a9d955
Update repository information.
...
Upstream-commit: 0356081c0ad2f1d95fb435f9a491f7a7a63cbf33
Component: engine
2013-07-16 17:04:41 -07:00
73fd748fb2
Testing, issue #1217 : Add coverage testing into docker-ci
...
Upstream-commit: 6e8bfc8d12ca062dc4c311d528784c1dec27079d
Component: engine
2013-07-16 13:45:43 -07:00
a4a2ab57ce
Update docs
...
Upstream-commit: 18e91d5f85a008ef48d724db964330ddaa1bbf10
Component: engine
2013-07-16 10:14:21 -07:00
edde9aeb1c
Add CompareConfig test
...
Upstream-commit: 48a892bee5270feea3d0e7b64963acb38dbd634b
Component: engine
2013-07-16 15:58:23 +00:00
e7c82564d0
add server.ContainerTop, server.poolAdd and ser.poolRemove tests
...
Upstream-commit: fb005a3da813ba855b6597c146b66842846df3d8
Component: engine
2013-07-16 14:38:18 +00:00
ef03a6ab8c
Hotfix: make sure ./utils tests pass
...
Upstream-commit: 1004d57b85fc3714b089da4c457228690f254504
Component: engine
2013-07-15 17:58:23 -07:00
f64f4f840f
Merge pull request #1210 from dotcloud/improve_configmerge
...
improve mergeconfig, ...
Upstream-commit: f9e4ef5eb0f48da1c562865017c183b57737985c
Component: engine
2013-07-15 18:04:12 -07:00
df2dfb45a8
Merge -b and -v options
...
Upstream-commit: eefbadd230d2788b0bdf0daac38ada0d145e3861
Component: engine
2013-07-15 17:51:32 -07:00
723f4f9ef0
Bump version to 0.5.0
...
Upstream-commit: bc21b3ebf0dadc51e47d971217d132e5299831a0
Component: engine
2013-07-15 14:57:52 -07:00
9051673e68
Merge pull request #1184 from dotcloud/1176-packaging-release
...
Hack: document PPA release step
Upstream-commit: 608fb2a21e948018bd5c75e56f5555123fda9bc7
Component: engine
2013-07-15 13:59:55 -07:00
f98fac335f
Do not overwrite container volumes from config
...
Fixes #819 Use same persistent volume when a container is restarted
Upstream-commit: 92cbb7cc80a63299b5670a9fcbb2d11789200696
Component: engine
2013-07-15 11:59:11 -09:00
f15cfa7eb5
Merge pull request #1188 from dotcloud/1174-packaging-binary
...
Packaging: add pure binary to docker release
Upstream-commit: 45050d9887fc7e4604eed21bb3b8fec320a11d30
Component: engine
2013-07-15 13:59:06 -07:00
72d4396796
packaging, issue #1176 : Document PPA release step
...
Upstream-commit: 75a0052e64d0b9cc214cd58ba798863c69f6c5d3
Component: engine
2013-07-15 12:13:51 -07:00
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
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
08204dd54e
Add unit test to check wrong uid case
...
Upstream-commit: e41507bde2d87cb9bbb0c328e414a39354dae10e
Component: engine
2013-07-15 10:05:09 -07:00
80066854b8
store both logs in a same file, as JSON
...
Upstream-commit: 599f85d4e4362f24dc2850c71a689671122c456b
Component: engine
2013-07-15 16:17:58 +00:00
cb4f99ad54
Merge branch 'master' into new_logs
...
Upstream-commit: 5756ba9bc48ef428bd73b9b123807097c1519db0
Component: engine
2013-07-15 13:57:54 +00:00
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
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
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
6fdf5346ea
Copy VolumesRW values when using --volumes-from
...
Fixes #1201
Upstream-commit: 5ae8c7a98592f83a31f3f45fc22728e45e95626c
Component: engine
2013-07-14 18:23:20 -09:00
f2d0413152
reuse the type
...
Upstream-commit: d639f61ec1c80f8d8d65386ec9331dbb6e218cb0
Component: engine
2013-07-13 19:19:38 +02:00
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
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
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
913ca03001
useless function. forgot to remove it.
...
Upstream-commit: a3b1a9f01a1c08c63e6c37945414481176817ba6
Component: engine
2013-07-13 17:04:04 +02:00
2ad516346a
useless type
...
Upstream-commit: 507cef8bcea5b56d25d34ca7073c46f608962f19
Component: engine
2013-07-13 17:03:04 +02:00
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
1aa0235482
Hack: use helper functions in tests for less copy-pasting
...
Upstream-commit: 080243f0407a90cdacf128dc3b53a802549d7797
Component: engine
2013-07-12 17:56:55 -07:00
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
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
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
969d894058
Packaging, issue #1202 : Upgrade vagrantfile go in debian packaging
...
Upstream-commit: c7a48e91d8d31a8b80b46f4cb17d866e36147ddc
Component: engine
2013-07-12 15:06:12 -07:00
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
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
