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
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
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
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
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
6fdf5346ea
Copy VolumesRW values when using --volumes-from
...
Fixes #1201
Upstream-commit: 5ae8c7a98592f83a31f3f45fc22728e45e95626c
Component: engine
2013-07-14 18:23:20 -09: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
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
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
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
23db3e215b
Revert "Client: better progressbar output"
...
This reverts commit 3ac68f1966222d9a1c0ff867515e3f5c2f83e422.
Upstream-commit: a6e5a397bd6b7967a91f1d7cbe581e46211964da
Component: engine
2013-07-12 20:08:45 +02:00
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
c8bc9a992c
Fixed tag option for "docker pull" (the option was ignored)
...
Upstream-commit: cd0fef633c5d871b192146e405ca7c5bebb2f3ba
Component: engine
2013-07-12 10:42:54 -07:00
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
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
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
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
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
ac70e7d7db
fix tests regarding the new test image
...
Upstream-commit: a8a6848ce0c3c54d00cfcd85727546e54a4dcf7e
Component: engine
2013-07-12 11:54:53 +00:00
c22c23bfc2
Merge branch 'master' into list_container_processes-feature
...
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
6a215f8175
Fix Docker Builder documentation numbering
...
Upstream-commit: 90483dc9123d6cb9eb1aa1bf4ba4e851d751784e
Component: engine
2013-07-11 16:41:19 -09:00
6c9e32ae32
Simplify unit tests code with mkRuntime()
...
Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b
Component: engine
2013-07-11 17:59:25 -07:00
b91cb2c854
Don't leave broken, commented out tests lying around.
...
Upstream-commit: 2ac11419806ce39c57d5caf6b41a66e5ddf45bc8
Component: engine
2013-07-11 17:58:45 -07:00
725d76d0d9
Hotfix: check the length of entrypoint before comparing.
...
Upstream-commit: 71d2ff494694d7f18310c7994daa34dce33af98b
Component: engine
2013-07-11 17:31:07 -07:00
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
5d58cdd260
change output
...
Upstream-commit: 976428f505b64a51efbd97f71acff5db2f4f5ed0
Component: engine
2013-07-11 21:04:23 +02:00
ba109b6d9a
fix broken docker port
...
Upstream-commit: affe7caf78288a638df3db37d5cebb4dc7f9ff72
Component: engine
2013-07-11 19:28:15 +02:00
de5cf1eef5
add debug for error in the server
...
Upstream-commit: b7937e268fcbc529a168164fc242edc56d51094c
Component: engine
2013-07-11 12:21:43 +00:00
cafbcadc85
Make the TestAllocate{UDP,TCP}PortLocalhost more reliable
...
- For the TCP test try again if socat wasn't listening yet;
- For the UDP test raise the timeout to a minute to workaround what
seems to be an issue with Linux.
Upstream-commit: 5a411fa38e49e5d79602f01fa9aaf058c12e5627
Component: engine
2013-07-10 18:25:53 -07:00
1aa2442604
Packaging, issue #1174 : Add pure binary to docker release
...
Upstream-commit: bf26ae03cfe38fc0fdd6f7dedd53041204df0767
Component: engine
2013-07-10 17:39:00 -07:00
720f595c48
Merge pull request #1178 from dotcloud/fix-dev-environment
...
Fix outdated docs explaining how to setup a dev environment
Upstream-commit: 3363cd5cd03ccc7d13517f5c3ec01017b26c0f5c
Component: engine
2013-07-10 16:53:22 -07:00
a7f78c9225
Merge pull request #1183 from dotcloud/960-packaging-PPA
...
Packaging, issue #960 : Document PUBLISH_PPA for staging/production release
Upstream-commit: 5c49a6135370c0adc485409cda3b2147df6e6b3a
Component: engine
2013-07-10 16:16:31 -07:00
646603a285
Packaging, issue #960 : Document PUBLISH_PPA for staging/production release
...
Upstream-commit: f83c31e18834d57ec56e1249b80174fbe0a0f8c9
Component: engine
2013-07-10 16:06:49 -07:00
26ac911253
Raise the timeouts for the TCP/UDP localhost proxy tests
...
Sometimes these tests fail, let's see if that improves the situation.
Upstream-commit: 8f36467107d623e94638e2dd4c625e34f670384d
Component: engine
2013-07-10 16:05:14 -07:00
61dbbbb8fe
Merge pull request #1181 from dotcloud/export_portmapping
...
Export PortMapping in container.go
Upstream-commit: 8e49cb453f7ed8469d1a10c784f8f8250e049623
Component: engine
2013-07-10 14:24:20 -07:00
72cf50da58
Rebased changes buildfile_test
...
Upstream-commit: 40f1e4edbecc841bd02b3a63b303d522299562c0
Component: engine
2013-07-10 07:12:57 -09:00
8121ba998d
Add unittest for volume config verification
...
Upstream-commit: 1267e15b0f73f4c40b3a053f0bf02981881a2bdd
Component: engine
2013-07-10 06:59:16 -09:00
7935041f18
Add VOLUME instruction to buildfile
...
Upstream-commit: eb9fef2c424178277cacd29d404cc8e774bb3891
Component: engine
2013-07-10 06:59:16 -09:00
252d0573c7
Merge pull request #1151 from alex/patch-1
...
Replaced gendered language in the README
Upstream-commit: 43b346d93b7a2bba58628fafcc9391a3203cef91
Component: engine
2013-07-10 07:52:30 -07:00
