58ded672ed
Fixes issues with mounting subdirectories of /mnt in container.
...
Tested with
mkdir /mnt/data
docker run -v /mnt/data:/mnt/data -t ubuntu:12.10 touch /mnt/data/bar
Expected /mnt/data/bar on host.
Upstream-commit: aa3697520a916ce2de525e020d2afa0bbd102df2
Component: engine
2013-10-09 16:40:46 -04:00
e754634d16
Merge pull request #2114 from metalivedev/2113-searchbump
...
Fix #2113 improve doc search results
Upstream-commit: c1bb33ea4d94d38b66f4e8582a584d12818d733a
Component: engine
2013-10-09 12:24:33 -07:00
a5787f2874
Clean up javascript comment.
...
Upstream-commit: 6545e53803a3f0d908510d87b350ca9641f50df2
Component: engine
2013-10-09 12:22:14 -07:00
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
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
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
d8303ba769
Add devenvironment link to CONTRIBUTING.md
...
Upstream-commit: 9a4b0b982393e0612fef70c37a04654ea46b4c1d
Component: engine
2013-10-08 16:48:19 -06: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
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
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
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
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
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
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
6963be7e37
Merge pull request #2015 from dsissitka/1927
...
Configured FPM to make /etc/init/docker.conf a config file.
Upstream-commit: 1332f400f7281aa726e4148b0831e5ccfec14a4d
Component: engine
2013-10-02 18:18:16 -07:00
02e5d0abf7
Merge pull request #2069 from philips/add-xz-to-runtime-dependencies
...
fix(hack/PACKAGERS): add xz utils as a runtime dep
Upstream-commit: a292c04ddb3d61f17f191c2eb57d0e6af5c5baea
Component: engine
2013-10-02 17:37:56 -07:00
6087f9fa5b
Merge pull request #2060 from mastahyeti/patch-1
...
Add `apt-get install curl` to Ubuntu docs
Upstream-commit: 37c4513cf91c73c01f8ebdf148c22f157499e592
Component: engine
2013-10-02 16:46:00 -07:00
2727640067
Merge pull request #2063 from dhrp/doc-template-fix
...
Doc template fix
Upstream-commit: b584c21ca419d81cdce86089bca3ee163540102e
Component: engine
2013-10-02 16:31:47 -07:00
dfb1941bb6
Merge pull request #2073 from tianon/gentoo-no-more-1422-hack
...
Remove Gentoo install notes about #1422 workaround
Upstream-commit: c92507341dce1ffcd4e59aca945e0e74dae57041
Component: engine
2013-10-02 16:24:11 -07:00
e12efc74cd
Merge pull request #2065 from kyleconroy/fix_ping_endpoint
...
Fix Ping endpoint documentation
Upstream-commit: 9f0feaa2e1b69f085631ed8397471c125df9f0a1
Component: engine
2013-10-02 16:22:49 -07:00
742265d87b
Update ubuntu docs to use wget instead of curl
...
Ubuntu doesn't come with curl.
wget instead of curl
nicer wget syntax
remove /dev/null
Upstream-commit: 0f830aa431b513d5ac2ee4f9e1239d860bbb4a01
Component: engine
2013-10-02 16:27:34 -06:00
f1f4164997
Remove Gentoo install notes about #1422 workaround
...
Upstream-commit: 5f05cb481760d551dcc3607b3c4dd48897b59cbd
Component: engine
2013-10-02 16:06:22 -06:00
7e8f18e24f
Merge pull request #2066 from tianon/vendor-bump-kr-pty
...
Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
Upstream-commit: 4778039dd2724accdba870cdaf1315d34bb67831
Component: engine
2013-10-02 14:44:07 -07:00
28014b74a7
Merge pull request #2014 from alexlarsson/allow_set_file_cap
...
* Runtime: lxc: Allow set_file_cap capability in container
Upstream-commit: b180770b1de71f6863cfc6cfd3896a574348c018
Component: engine
2013-10-02 14:38:50 -07:00
9a40945c21
fix(hack/PACKAGERS): add xz utils as a runtime dep
...
Upstream-commit: 4f5c2cbccc2ef80f5372ebb4abb38d33343f2c86
Component: engine
2013-10-02 12:06:19 -07:00
22c64c0aa6
Merge pull request #2047 from Thermionix/patch-1
...
Update archlinux.rst
Upstream-commit: c3acd9bece0aef08e035544122d2d9270f5d76c9
Component: engine
2013-10-02 10:57:48 -07:00
1ada892daf
Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
...
Upstream-commit: cb21a4049052a012fd71dcaceef2bb57e1ed36f8
Component: engine
2013-10-01 19:48:50 -06:00
e2a3c979d5
Cleanup
...
Upstream-commit: 5025b4d09443019e1e8636288f3e6dbb085253cd
Component: engine
2013-10-01 16:32:56 -07:00
c9a5101a95
Add/modified the canonical link to work with all /index/ links. Added style for "danger'
...
Upstream-commit: 509e25cf04cf1984ae0c9112a8c380492d177be8
Component: engine
2013-10-01 16:26:14 -07:00
8b264261cb
testing, issue #1948 : Increase TestAttachDetach and TestRunDetach timeout
...
Upstream-commit: 135c1fce90eeaee9f6aef5d0119028cd017a1a73
Component: engine
2013-10-01 15:59:52 -07:00
0091aaec1e
Fix Ping endpoint documentation
...
Upstream-commit: d517fd3d77cea103008e7f937f1629048cdba24a
Component: engine
2013-10-01 15:49:32 -07:00
6cd78bd3a4
Fix ironic typo in changelog
...
Upstream-commit: 45bd52d472c3131c7ad5077cf8b20a241d82c555
Component: engine
2013-10-01 18:16:10 +02:00
a2b13fee1d
fix logo path
...
Upstream-commit: 534a991cff405a469754f6afc4fd8aa4be79e444
Component: engine
2013-09-30 16:54:04 -07:00
98a0159ef9
Merge pull request #1994 from metalivedev/1993-legalcontext
...
Fix #1993 : add explanation for export restrictions
Upstream-commit: 23015fa14dd3f58e582d7ef3039262025b06f21c
Component: engine
2013-09-30 16:33:46 -07:00
d8c814f4ca
Update archlinux.rst
...
Upstream-commit: fb46d911c204ddda381325c5f1e43277b7b231c2
Component: engine
2013-10-01 09:33:12 +10:00
61073fc069
Merge pull request #2051 from tianon/hack-dockerfile-refactor
...
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
Upstream-commit: 85b776995cfcd02a8b0f6f07f6b5f57238363e83
Component: engine
2013-09-30 16:29:32 -07:00
c186883e60
Merge pull request #2035 from dhrp/style-revamp
...
Changes to a new style for the docs. Includes version switcher.
Upstream-commit: fa44555fb44f370ac01a1c26da3d5c1927833335
Component: engine
2013-09-30 15:51:43 -07:00
33aa0c2b85
Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
...
Upstream-commit: ccefe47897bdcef8b56bf54d4bd324989855f3b5
Component: engine
2013-09-30 13:57:30 -06:00
cf42215112
Merge pull request #2039 from tianon/mkimage-centos
...
Add contrib/mkimage-centos.sh back (from #1621 ), and associated documentation link
Upstream-commit: ff850319803a4c5910ec0a5a34134bf4af99d58e
Component: engine
2013-09-30 10:51:06 -07:00
7bb18042ef
Update archlinux.rst
...
The /etc/sysctl.conf file is deprecated
https://www.archlinux.org/news/deprecation-of-etcsysctlconf/
Upstream-commit: 88f710f0e79eafe469e09a3ea990bdbe0c7d0a52
Component: engine
2013-09-30 22:44:09 +10:00
