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
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
aa8559ee18
updated the rmi command docs, the had typos
...
Upstream-commit: 364f48d6c7386874ee3fa0696b7a466f76fcf698
Component: engine
2013-07-12 14:05:26 -04:00
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
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
3442b5e984
Add param to api docs for verbose build output
...
Upstream-commit: d0c73c28df5627bc7158fd54860f6751b4dab0f9
Component: engine
2013-07-12 06:22:56 -09: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
18c42253ef
use http://get.docker.io/latest
...
Upstream-commit: e9011122fbc4c65afe235a75ca8197ce4fd23753
Component: engine
2013-07-12 11:45:40 +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
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
7bf5a45cfe
Fix buildfile tests after rebase
...
Upstream-commit: 49044a96089487b9df075fa972e83e4c05c7fae8
Component: engine
2013-07-11 15:37:26 -09:00
725d76d0d9
Hotfix: check the length of entrypoint before comparing.
...
Upstream-commit: 71d2ff494694d7f18310c7994daa34dce33af98b
Component: engine
2013-07-11 17:31:07 -07:00
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
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
750c01d0af
wip
...
Upstream-commit: 941e3e2ef09092306a7a287ce62b6fb518af9c56
Component: engine
2013-07-11 17:18:28 +00: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
ebb59e49d1
reduce the number of string copy operations.
...
Upstream-commit: 73e79a3310f3976b61a295f45e12aead9af41962
Component: engine
2013-07-10 18:59:43 -04:00
98e450c93d
format in the user agent header should follow RFC 2616
...
Upstream-commit: 34cf976866f66bc77b961f4e66a9dd8aad1ffb00
Component: engine
2013-07-10 18:59:43 -04:00
81ebd3a19c
Removed an unnecessary nil assignment
...
Upstream-commit: e832b01349fec2acee6ec3219dc9bfb61ad38764
Component: engine
2013-07-10 18:56:49 -04:00
9939aac9f5
Removed an unnecessary error check.
...
Upstream-commit: 26c8eae6fea53e9a78bd035614fff20086f00b17
Component: engine
2013-07-10 18:56:49 -04:00
5042ef8b4a
added client's kernel version
...
Upstream-commit: d40efc4648af6bb5c60b37a789effd602af1f132
Component: engine
2013-07-10 18:56:49 -04:00
addc24cbb8
Insert version checkers when call NewRegistry()
...
Upstream-commit: 5705a493080ba5571a7929d37e7926678a982cb4
Component: engine
2013-07-10 18:56:49 -04:00
d233f1b215
added APIVersion when call NewRegistry
...
Upstream-commit: 65185a565b8e05a2dd58e10d1c1ad560f4a255cf
Component: engine
2013-07-10 18:53:38 -04:00
4c0f88c190
inserted setUserAgent in each HTTP request
...
Upstream-commit: 1bb8f60d5ae3810b465dd3c79a7a572fb017d078
Component: engine
2013-07-10 18:49:01 -04:00
eb5095a476
Added version checker interface
...
Upstream-commit: 1d01189f04f5187bd39e9212b7af3b3e83e86361
Component: engine
2013-07-10 18:49:01 -04:00
dedc7724c8
change tag -> repo name in build usage
...
Upstream-commit: fc3a8e409d182ade45c697c244562e20beee9f9a
Component: engine
2013-07-10 22:44:31 +00:00
