2971930d8c
Merge pull request #2127 from titanous/close-body
...
Fix some error cases where a HTTP body might not be closed
Upstream-commit: d30806590c8436941e5c4f2349af61de0128c49e
Component: engine
2013-10-09 06:52:03 -07:00
177e714a8f
replace panic by log.Fatal in tests
...
Upstream-commit: 823174de4d1acb93613c1b5ba53873906f43f62c
Component: engine
2013-10-09 13:47:49 +00:00
d81c62612b
Merge pull request #1956 from tianon/bash-completion
...
Add proper bash completion for "docker push"
Upstream-commit: d5f9160441eac56448dbf8418e2f178ea2bcdd06
Component: engine
2013-10-09 05:47:55 -07:00
1671af4f28
document what vagrant up is actually doing
...
* don't mention outdated PPA that Vagrantfile doesn't use
* point to official Ubuntu installation instructions that Vagrant appears to be following; should be future proof
Upstream-commit: 37df1d92d8d2b167bb90bb82c086b947371d7497
Component: engine
2013-10-09 15:05:09 +04:00
4af9c06750
Update AUTHORS
...
Upstream-commit: dabac81824f8ab9ec0bd80f1fcaa026aa103b1e3
Component: engine
2013-10-08 23:51:38 -04:00
cb3a2394e0
Merge pull request #2130 from tianon/swap-contrib-maintainers
...
Swap contrib MAINTAINERS
Upstream-commit: bb62c281f57f7f36480b4d2f971105cad7df9f88
Component: engine
2013-10-08 17:57:52 -07:00
04766fa3d4
Merge pull request #2134 from tianon/contributing
...
Add devenvironment link to CONTRIBUTING.md
Upstream-commit: 3565bf8d005707f1d7cf9372c188aaa2d85d625c
Component: engine
2013-10-08 17:36:56 -07:00
65b5bca147
Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example.
...
Upstream-commit: f4c17a202b5f6021d48c3cb3342c37607b509630
Component: engine
2013-10-08 17:33:19 -07:00
d8303ba769
Add devenvironment link to CONTRIBUTING.md
...
Upstream-commit: 9a4b0b982393e0612fef70c37a04654ea46b4c1d
Component: engine
2013-10-08 16:48:19 -06:00
921ffe0649
Make sure to close the network allocators
...
Upstream-commit: 9107565d0634ea3eed3290c6c4b6c0f006fdefe8
Component: engine
2013-10-08 15:42:02 -07:00
d17d5e16ae
replace 127.0.0.1 by the assigned IP address in the container's /etc/hosts file.
...
Upstream-commit: 7d95d300abd9d9cc811713e53fd41adec66f2e00
Component: engine
2013-10-08 14:29:22 -07:00
eb4a3a8402
Swap contrib MAINTAINERS
...
Upstream-commit: 4fda3314d871a28e33b0d901d6ca3a6d987c8dfa
Component: engine
2013-10-08 15:15:58 -06:00
6dfdc03073
Fix some error cases where a HTTP body might not be closed
...
Refs #2126
Upstream-commit: e906485b07fbf32a2c38495651d907af6b229962
Component: engine
2013-10-08 15:35:00 -04:00
bbfd951535
fix rm -v
...
Upstream-commit: 1daf242c8bafa0447c099b0e49826667a8155c5c
Component: engine
2013-10-08 16:35:47 +00:00
537fcd112e
Use correct auth config when logging in.
...
Upstream-commit: 967010ae8c7eb2f6482a9245b42731b7ead61e4b
Component: engine
2013-10-08 06:46:29 +02:00
4878575100
use empty string so TempDir uses the OS's temp dir automatically ( Closes #2117 )
...
Upstream-commit: d03022b9ca5e658e551ab3b9907da946b11a0b4c
Component: engine
2013-10-08 13:24:20 +10:00
aa13b96b8a
Insert popularity and boost docs results.
...
Upstream-commit: 6d67ac2a1b93d6c95881cb2f17250a7a8279def6
Component: engine
2013-10-07 17:51:07 -07:00
22bcf655f6
Merge pull request #2103 from tianon/clean-out-fixme
...
Clean out a few outdated FIXME items
Upstream-commit: 2d425af1b1675cfc6399d99a2b00f8efc219d7a9
Component: engine
2013-10-07 15:19:01 -07:00
e57acec080
Merge pull request #2106 from mastahyeti/api_1.5_docs_whitespace
...
Cleanup whitespace in API 1.5 docs
Upstream-commit: ed19693f50dec769daaa1d2c4dd702d0421e5d6c
Component: engine
2013-10-07 13:23:55 -07:00
e8211a620d
Fix contrib/mkimage-debian.sh apt caching prevention
...
Upstream-commit: ee27444098aa91d69f8df6dd07139b9637719b1d
Component: engine
2013-10-07 13:41:10 -06:00
aca42d0e27
Merge pull request #2109 from shamrin/patch-4
...
[docs] use angle brackets in MAINTAINER example email
Upstream-commit: 194c1dbbd81571da12b66831f3bb29be8913f0ea
Component: engine
2013-10-07 12:18:44 -07:00
c5b5b5d5ad
[docs] use angle brackets in MAINTAINER example email
...
Upstream-commit: a9eac7eab4c9867114c94cace52d1c889c249293
Component: engine
2013-10-07 20:29:54 +04:00
a8d55bfe7b
Cleanup whitespace in API 1.5 docs
...
remove whitespace on blank lines
Upstream-commit: 7c28683f08a485916e748713b0697ea3eb84a9e2
Component: engine
2013-10-06 19:52:18 -06:00
8cca5d988d
Merge pull request #2061 from dotcloud/1948-test-detach
...
testing, issue #1948 : Increase TestRunDetach timeout
Upstream-commit: c18e849451a3f48cecb82a5747f131e310cb0433
Component: engine
2013-10-06 13:26:44 -07:00
0722c6f3b0
Clean out a few outdated FIXME items
...
Upstream-commit: a665517151911866285e5a72164c5f2d2f31ba65
Component: engine
2013-10-06 13:55:26 -06:00
567344fa64
Add Developer Certificate of Origin Text
...
We purposely chose to license Docker under the Apache 2.0 license. This is a well-known
license, which is popular for its permissive and flexible properties, while still
encouraging a collaborative community. It also makes certain representations with regard
to contributions, and the rights given to contributors, the project, people who use Docker,
people who modify Docker, etc.
This approach to contributions is inspired by the popular Linux Developer
"Certificate of Origin". This approach makes it simple for new contributors to get started,
and avoids bureaucracy in tracking contributions and contributors.
To indicate accordance, each individual contribution to the Project is signed off by the
developer, using his or her real name, email address, and github handle in the format below:
Docker-DCO-1.0-Signed-off-by: Joe Smith <joe.smith@email.com >
Upstream-commit: 821a82ac6ceffd7001b80769ba23b81a7e4a81ad
Component: engine
2013-10-04 14:27:26 -07:00
345077d21b
added initial draft of the Docker infrastructure doc
...
Upstream-commit: 0d3c899528f00f222080915e800388f5d2821861
Component: engine
2013-10-04 15:12:40 -04:00
d54ac9648d
Merge pull request #2084 from makeusabrew/patch-1
...
Fix help text for -v option
Upstream-commit: 863eebe7bd7d5f9ac9f49619643078ea540154ff
Component: engine
2013-10-04 09:29:56 -07:00
7bc3cd3dbe
Merge pull request #2087 from alexlarsson/device-mapper-test
...
Device mapper test branch update
Upstream-commit: f6913592a12b0ae98b4f2c9132da7101f74b859a
Component: engine
2013-10-04 07:54:43 -07:00
b3baf515e4
Tests: Initialize devicemapper early to avoid it happening in a test
...
This can take a while and may cause some tests to timeout
Upstream-commit: aaf1f73bcc2c594f07254a98ff77de3cc6351e92
Component: engine
2013-10-04 15:47:43 +02:00
a29076830e
hack: Don't just run the "TestRunHostname" test
...
Upstream-commit: 9b65c7cf49feacad61cdcd11d2b002319a6b6bae
Component: engine
2013-10-04 15:38:47 +02:00
850aea64f1
Remove overly spewy Debugf
...
Upstream-commit: f7e374fb3a51bd25e61ae6c4343838a0ca756fba
Component: engine
2013-10-04 15:36:30 +02:00
d30e1ed4d3
Fix help text for -v option
...
Upstream-commit: 3c5350ba922dd6611dab714db82cdd2d0210f5c5
Component: engine
2013-10-04 10:26:57 +01:00
3e9f502097
Merge pull request #1876 from asbjornenge/master
...
Added Dockerfile.tmLanguage to contrib
Upstream-commit: c52c95f97fe3a596d3114be88d5593f6fb8dba34
Component: engine
2013-10-03 23:52:37 -07:00
531e0dc8b0
Added Dockerfile.tmLanguage to contrib
...
Upstream-commit: 85a51396657945613141abb8a521e118db15afe3
Component: engine
2013-10-04 08:45:15 +02:00
baed3230a9
Small fixes
...
Upstream-commit: f29c500d8d480547874425ba98a9381fdc9df89e
Component: engine
2013-10-03 18:05:07 -07:00
ff1de35e89
Small fixes
...
Upstream-commit: b8439987184df45ee9571f9eb9d607518d96aeb8
Component: engine
2013-10-03 18:04:14 -07:00
52102a8dde
Merge pull request #1832 from dotcloud/26-default_r_flag
...
Autorestart containers by default
Upstream-commit: ad4b09cdb833e5ed423d033f5abb6a3b1d567082
Component: engine
2013-10-03 15:59:58 -07:00
3ce3024fa4
keep -r, but default true
...
Upstream-commit: e594c788e4f42d4878c1b3d16139db0291ed830c
Component: engine
2013-10-03 22:42:35 +00:00
c5e3b824b5
add missing error check
...
Upstream-commit: f84dc1e90858924f9fafe89e81005842a6b4f166
Component: engine
2013-10-03 22:33:00 +00:00
c443ca5ca0
Merge pull request #1990 from modcloth-labs/more-tests-for-auth-registry-resolution
...
Adding more tests around `auth.ResolveAuthConfig`
Upstream-commit: 826aaa0e9bb9625fc8a1accfcc566f06baf0223f
Component: engine
2013-10-03 14:45:02 -07:00
78b0694228
Make sure we mark the libdevmapper /dev/mapper/control fd CLOEXEC
...
We do a hack to mark it such, because otherwise lxc-start will not
work.
Upstream-commit: 1a1be5a87c2169def7b0b0c29fc5cbac850a00a5
Component: engine
2013-10-03 21:00:16 +02:00
c413093856
Be better at cleaning up leftover from earlier test runs
...
When running the test inside a docker container we sometimes are left with
leftover device nodes for device mapper devices that no longer exist.
We were panic:ing in this case, but with this change we just remove such
nodes.
Upstream-commit: 7b58e15b08349dba35bf3813f77a0b900c2e4df5
Component: engine
2013-10-03 19:54:14 +02:00
34abbb9020
Add test
...
Upstream-commit: 1328be7c299417aa8c8740ac4901a978724afa9b
Component: engine
2013-10-03 15:21:14 +00:00
7dc11f73be
Random improvments
...
Upstream-commit: 8b2f4aab232880cb0d7faa18ae12adb33f483b2c
Component: engine
2013-10-02 20:18:15 -07:00
788a1fc558
Update Dockerfile and hack to support compiling device-mapper code statically (using go1.2rc1)
...
Upstream-commit: 06d0843a61843e6b16a56d518e21032a5652098b
Component: engine
2013-10-03 10:32:47 -06:00
e87cd90363
rebase
...
Upstream-commit: deb05a36e8cb0361c7900b128e594cd6db06ba73
Component: engine
2013-10-03 15:49:28 +00:00
705988989e
disable: don't create device nodes manually if udev is not availabile as we don't have it in dind
...
Upstream-commit: 55189307d0ec6992f76572fae675bd371cc36cff
Component: engine
2013-10-03 15:47:38 +00:00
716ed9c609
Fix #2017 Merge branch '2017-api-details'
...
Upstream-commit: ff4f32d58f64ee7fc8bab26bc0dd410fb1c7dc5e
Component: engine
2013-10-02 18:20:44 -07:00
0d5f83ca5f
Merge branch 'hint-api-details' of git://github.com/cdunklau/docker into 2017-api-details
...
Conflicts:
docs/sources/api/docker_remote_api.rst
Upstream-commit: 462ac1efcfbbe32a57f1178b28d0bc1733b86675
Component: engine
2013-10-02 18:18:46 -07:00
