ff40126389
Merge pull request #10070 from thaJeztah/change-back-error-message
...
Mention "or rename" again in error-message.
2015-01-13 14:56:15 -08:00
d8e6e32222
Merge pull request #10073 from tonistiigi/fix-unix-integration-cli
...
Fix filenames for unix only integration-cli tests
2015-01-13 14:55:31 -08:00
3943b381ef
Merge pull request #10071 from mota/cleanup-router
...
Remove error return type from createRouter and ServeRequest
2015-01-13 14:46:36 -08:00
f9876dade2
Fix filenames for unix only integration-cli tests
...
Test suffix comes after the platform/arch.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-01-14 00:31:25 +02:00
492b18ac08
Rewrite TestRunMutableNetworkFiles to avoid races
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-01-13 14:14:36 -08:00
02923d43e2
Remove error return type from createRouter and ServeRequest
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com>
2015-01-13 22:43:31 +01:00
5862422a49
Merge pull request #10058 from HuKeping/work
...
restart: Fix the compare of restart policy
2015-01-13 13:38:52 -08:00
78820a63d6
Mention "or rename" again in error-message.
...
The "or rename" part was removed from the error-message,
because renaming wasn't possible at the time.
Now that https://github.com/docker/docker/pull/8570 is merged,
renaming existing containers is possible.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-01-13 21:57:48 +01:00
0db6bb3cbf
Merge pull request #10069 from tianon/docker-py-commit
...
Switch docker-py clone to use an explicit commit for natural cache-busting
2015-01-13 11:43:28 -08:00
3c01c971cd
Switch docker-py clone to use an explicit commit for natural cache-busting
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-13 12:34:55 -07:00
99a15ec8bd
Merge pull request #9973 from duglin/Issue9880
...
Make sure that ADD/COPY still populate the cache even if they don't use it
2015-01-13 11:17:34 -08:00
eaeaf0d8e3
Merge pull request #10064 from hqhq/hq_fix_flag_comments
...
correct the flag comments
2015-01-13 11:06:24 -08:00
ab86f591c3
Merge pull request #9951 from andersjanmyr/add-proxy-from-environment-to-client
...
Add ProxyFromEnvironment enables client via proxy.
2015-01-13 10:53:00 -08:00
21cf4b4c4c
Merge pull request #9764 from ztombol/fix-reduce-arch-rootfs-size
...
Revisiting mkimage-arch.sh
2015-01-13 10:39:45 -08:00
b9e42d66e7
Merge pull request #8570 from brahmaroutu/rename_container_3036
...
Rename a existing container
2015-01-13 10:37:29 -08:00
9621e59909
Merge pull request #10013 from icecrime/9979_oom_exit_code
...
Fix error code when exiting on OOM
2015-01-13 10:33:21 -08:00
18c0b41564
Delete man pages of installed packages in mkimage-arch.sh
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
2015-01-13 18:10:50 +01:00
9f59b057be
Revise list of installed packages in mkimage-arch.sh
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
2015-01-13 18:10:50 +01:00
6e5c5d33dd
Merge pull request #10008 from rhatdan/help
...
Fix docker run/create not printing error messages
2015-01-13 06:48:33 -08:00
12a7e78b12
Fix docker run/exec/create not printing error messages
...
If an error message happens while parsing docker run or docker exec, the message
is not being printed out.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-01-13 09:23:13 -05:00
00bd7b4c41
correct the flag comments
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-01-13 15:40:24 +08:00
9a9339d9a2
Test case for error code when exiting on OOM
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-01-12 23:16:28 -08:00
e721ed9b53
restart: Fix the compare of restart policy
...
Since the failure count of container will increase by 1 every time it
exits successfully, the compare in function shouldRestart() will stop
container to restart by the last time.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-01-13 13:05:30 +08:00
9f2c486144
Merge pull request #10055 from icecrime/upgrade_libcontainer
...
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
2015-01-12 20:44:25 -08:00
5d59fdcd38
Merge pull request #10057 from tianon/fix-tgz
...
Fix tgz for Windows binaries
2015-01-12 20:28:04 -07:00
21a809d9ae
rename a existing container
...
Closes #3036
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-01-13 03:27:17 +00:00
71b03d8aeb
Fix tgz for Windows binaries
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-12 19:56:53 -07:00
009041cdfd
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
...
Correct exit code when dying on a signal (fixes #9979 ).
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-01-12 18:12:59 -08:00
400d92871c
Add --link accept container ID
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-01-13 09:38:12 +08:00
9b0072a7e6
Merge pull request #10029 from soulshake/add-cecilia-payne-gaposchkin
...
Add Cecilia Payne-Gaposchkin to names generator.
2015-01-12 17:31:19 -08:00
41178adb7e
Add Cecilia Payne-Gaposchkin to the names generator.
...
Signed-off-by: AJ Bowen <aj@gandi.net>
2015-01-12 16:24:15 -08:00
0da9540eda
Merge pull request #10054 from shin-/docker-py-bump-0.7.1
...
Bumped docker-py version to latest release
2015-01-12 15:27:44 -08:00
6ef475bada
Merge pull request #10053 from vieux/update_copyrights
...
update copyrights to 2015
2015-01-12 15:07:59 -08:00
3873b19c31
Bumped docker-py version to latest release
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-01-12 15:01:09 -08:00
b70632ec53
fix issue with goimport
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-12 22:52:19 +00:00
e5869b2b0b
update copyrights to 2015
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-01-12 22:47:36 +00:00
43a75f5b93
Merge pull request #9962 from andi5/fix-doc-cmdline-port
...
Fix order of pause and port in command line documentation.
2015-01-12 13:22:51 -08:00
4e0f656d74
Merge pull request #10051 from thaJeztah/fix-error-message
...
Fix typo in error-message.
2015-01-12 13:12:10 -08:00
9215c3901e
Merge pull request #10019 from jfrazelle/9954-text-plain-content-type
...
Use "text/plain" content-type
2015-01-12 12:50:35 -08:00
5f699a465d
Fix typo in error-message.
...
This fixes a small typo in the errormessage for memory-swap.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-01-12 21:48:44 +01:00
3ec6959240
Merge pull request #9985 from jfrazelle/fix-exited-filter-should-not-show-running
...
`docker ps --filter exited=status` should not show running containers
2015-01-12 15:09:22 -05:00
a52c3a74f8
Merge pull request #9953 from evverx/patch-1
...
Update Ubuntu image tag to 14.04
2015-01-12 12:07:12 -08:00
e90e754682
Merge pull request #9987 from jfrazelle/fix-filter-status-exited-not-require-all
...
`docker ps --filter status=exited should not require passing -a`
2015-01-12 15:05:58 -05:00
16fe2ac6b2
Merge pull request #9988 from nponeccop/patch-1
...
FsMagic should avoid sign extension on i686
2015-01-12 12:02:09 -08:00
ed47284f0d
Merge pull request #9992 from iKevinY/readme-italics
...
Add missing italics to list items in README
2015-01-12 11:50:04 -08:00
cd5902fc7b
Fix range for go 1.3
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-12 11:49:52 -08:00
862a124db4
Merge pull request #10014 from tianon/fix-msys
...
Fix a few minor issues with building/running inside msysGit
2015-01-12 11:44:43 -08:00
83ab6237ac
Merge pull request #10047 from vbatts/vbatts-graphdriver_driver_put_with_error
...
graphdriver: change (*Driver).Put signature
2015-01-12 11:42:11 -08:00
d17e4175b6
Merge pull request #10009 from jfrazelle/add-master-docs-to-readme
...
Add link to master docs.
2015-01-12 11:31:11 -08:00
1c57555285
Merge pull request #10048 from vbatts/vbatts-dm_no_newline
...
devmapper: remove newline string
2015-01-12 14:26:19 -05:00
Victor Vieux
Tonis Tiigi
Alexander Morozov
Pierre Wacrenier
Alexander Morozov
Sebastiaan van Stijn
Michael Crosby
Tianon Gravi
Jessie Frazelle
Zoltan Tombol
Dan Walsh
Qiang Huang
Arnaud Porterie
HuKeping
Srini Brahmaroutu
Lei Jitang
AJ Bowen
Joffrey F
Victor Vieux
Vincent Batts
Jessica Frazelle