Michael Crosby
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
Andy Rothfusz
716ed9c609
Fix #2017 Merge branch '2017-api-details'
...
Upstream-commit: ff4f32d58f64ee7fc8bab26bc0dd410fb1c7dc5e
Component: engine
2013-10-02 18:20:44 -07:00
Andy Rothfusz
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
Solomon Hykes
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
Solomon Hykes
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
Andy Rothfusz
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
Andy Rothfusz
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
Andy Rothfusz
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
Andy Rothfusz
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
Ben Toews
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
Tianon Gravi
f1f4164997
Remove Gentoo install notes about #1422 workaround
...
Upstream-commit: 5f05cb481760d551dcc3607b3c4dd48897b59cbd
Component: engine
2013-10-02 16:06:22 -06:00
Michael Crosby
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
Guillaume J. Charmes
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
Brandon Philips
9a40945c21
fix(hack/PACKAGERS): add xz utils as a runtime dep
...
Upstream-commit: 4f5c2cbccc2ef80f5372ebb4abb38d33343f2c86
Component: engine
2013-10-02 12:06:19 -07:00
Andy Rothfusz
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
Tianon Gravi
1ada892daf
Bump vendor kr/pty to commit 3b1f6487b (syscall.O_NOCTTY)
...
Upstream-commit: cb21a4049052a012fd71dcaceef2bb57e1ed36f8
Component: engine
2013-10-01 19:48:50 -06:00
Thatcher Peskens
e2a3c979d5
Cleanup
...
Upstream-commit: 5025b4d09443019e1e8636288f3e6dbb085253cd
Component: engine
2013-10-01 16:32:56 -07:00
Thatcher Peskens
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
Kyle Conroy
0091aaec1e
Fix Ping endpoint documentation
...
Upstream-commit: d517fd3d77cea103008e7f937f1629048cdba24a
Component: engine
2013-10-01 15:49:32 -07:00
Marcus Ramberg
6cd78bd3a4
Fix ironic typo in changelog
...
Upstream-commit: 45bd52d472c3131c7ad5077cf8b20a241d82c555
Component: engine
2013-10-01 18:16:10 +02:00
Andy Rothfusz
a2b13fee1d
fix logo path
...
Upstream-commit: 534a991cff405a469754f6afc4fd8aa4be79e444
Component: engine
2013-09-30 16:54:04 -07:00
Solomon Hykes
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
Thermionix
d8c814f4ca
Update archlinux.rst
...
Upstream-commit: fb46d911c204ddda381325c5f1e43277b7b231c2
Component: engine
2013-10-01 09:33:12 +10:00
Tianon Gravi
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
Thatcher
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
Tianon Gravi
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
Tianon Gravi
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
Thermionix
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
Victor Vieux
bc13d7f295
fix panic with wrong dockercfg file
...
Upstream-commit: 649605915428e0ee81cf49d15e949d48da20110c
Component: engine
2013-09-30 11:07:32 +00:00
Victor Vieux
4664dde409
Merge pull request #1995 from dotcloud/fix_attach_2
...
Fix the attach behavior with -i
Upstream-commit: bcce3cbdd1cb4d79272c0cbfa43ef0847be1b9d9
Component: engine
2013-09-30 03:29:19 -07:00
Victor Vieux
cc91061a09
Merge pull request #2025 from dotcloud/2020_add_dockercfg_doc
...
add .dockercfg doc
Upstream-commit: bbf644ed62cf815cf40ef3de3345fac7ed42588a
Component: engine
2013-09-30 03:21:46 -07:00
Tianon Gravi
bda4d2512b
Add contrib/mkimage-centos.sh back (from #1621 ), and associated documentation link
...
Upstream-commit: d89ce09a76e7934338d4966d05f6b67618c8bfb0
Component: engine
2013-09-28 07:54:34 -06:00
Thatcher Peskens
17c973c7fe
Changes to a new style for the docs. Includes version switcher.
...
* added link to edit on GitHub
* Changed image source on homepage
* Made some changes to the structure, added the ability to have l3 navigation. Added warning, note and other styles.
* Fixed an image link, removed the .. :content: links because they were quicky and didn't look good, added pagelinks to current page of other versions.
* Moved the remote client api's to their own doc
Upstream-commit: e3e041b6bf0066fa5e65625694517ff387fee3b1
Component: engine
2013-09-27 19:54:52 -07:00
Andy Rothfusz
ac095d59b4
Added more context.
...
Upstream-commit: 0a35b1fb3681561a1f3f139d989c0bd133122123
Component: engine
2013-09-27 19:07:12 -07:00
Guillaume J. Charmes
54929011c2
Fix the attach behavior with -i
...
Upstream-commit: 537149829accde869430924cf988f64cfbd16f99
Component: engine
2013-09-27 11:10:55 -07:00
Victor Vieux
e40fd9a21b
add .dockercfg doc
...
Upstream-commit: f4855a7cf00cc96cfffc5cb704b3b2493fe3601e
Component: engine
2013-09-27 18:19:17 +02:00
Colin Dunklau
c1d534a826
Clearly point at detailed docs
...
Upstream-commit: edd90d46c778d28e4cf2d68a504218698a1e1e61
Component: engine
2013-09-27 08:32:55 -05:00
Guillaume J. Charmes
f9de2ea5c3
Merge pull request #1842 from dotcloud/split_stdout_stderr
...
* Runtime: Split stdout stderr
Upstream-commit: f435970695e896ae8532cd0850700ae56d0b0516
Component: engine
2013-09-26 18:05:24 -07:00
Guillaume J. Charmes
c6a1c7cdae
Update docs + fix endian issue
...
Upstream-commit: cb18a6e1b934b7f5c63f8931ee8fe51e2789c597
Component: engine
2013-09-26 17:36:21 -07:00
Michael Crosby
5ead415a2c
Move run -rm to the cli only
...
Upstream-commit: 723de8768145cb47fdb6af399043f9313ad29cdb
Component: engine
2013-09-26 14:52:37 -07:00
Daniel Mizyrycki
6991928d6e
Merge pull request #2006 from jo-m/master
...
Enable SSH Agent forwarding in Vagrant VM
Upstream-commit: b081a740b3073816e8a00bd6a2070690a475ade7
Component: engine
2013-09-27 12:07:44 -07:00
Michael Crosby
3724fa4a50
Merge pull request #1589 from unclejack/479-add_rm_support_to_docker_run
...
Add -rm to docker run for removing a container on exit
Upstream-commit: db869ecce57baa71f8b5eccf5fb769c3c6796438
Component: engine
2013-09-27 11:45:32 -07:00
Andy Rothfusz
d4572af49a
Merge pull request #2009 from kyleconroy/master
...
Improve registry and index REST API documentation
Upstream-commit: ba10e289275e6e7feed851f439e8ac90078bf50f
Component: engine
2013-09-27 10:56:21 -07:00
unclejack
5bcfc0bffe
automatically remove container via -rm
...
add AutoRemove to HostConfig
add -rm flag to docker run
add TestRunAutoRemove to test -rm
docs: add -rm to commandline/command/run
add hostConfig to container monitor
make monitor destroy the container via -rm
This adds support for automatically removing a container after it
exits. The removal of the container is handled on the server side.
Upstream-commit: 22e7e107addc4703ee6ef36981dfafe985be695d
Component: engine
2013-09-27 17:43:12 +03:00
Kyle Conroy
6cfd549810
Fix copypasta errors
...
Upstream-commit: ce05083d4bd78a8c8272742095cf662fa86739ef
Component: engine
2013-09-26 14:57:02 -07:00
David Sissitka
6693d06bc7
Used tabs for alignment when I should've used spaces. Fixed.
...
Upstream-commit: c22e377a6d36816210803e34e4d73cf45a4aa828
Component: engine
2013-09-26 13:56:59 -07:00
Colin Dunklau
82ab106f91
Hint for Remote API doc details in header links
...
Upstream-commit: 3f0d0075f8db4ca909db266611ce99023285c061
Component: engine
2013-09-26 15:30:26 -05:00
David Sissitka
f400840b85
Configured FPM to make /etc/init/docker.conf a config file.
...
Upstream-commit: f8c9f11f067ef94a35cbc35b8d15f67d57ce1aec
Component: engine
2013-09-26 12:52:43 -07:00
Alexander Larsson
49b5b0c54d
lxc: Allow set_file_cap capability in container
...
This means you're able to set the bits for capabilities on files
inside the container. This is needed for e.g. many fedora packages
as they use finegrained capabilities rather than setuid binaries.
This is safe as we're not adding capabilities really, since the
container is already allowed to create setuid binaries. Setuid
binaries are strictly more powerful that any capabilities (as root implies
all capabilities).
This doesn't mean the container can *gain* capabilities that it
doesn't already have though. The actual set of caps are strictly
decreasing.
Upstream-commit: 80319add5542153146fdaecd46be5549b4397beb
Component: engine
2013-09-26 21:41:45 +02:00
Kyle Conroy
949b66aca3
Fix Authorization headers
...
Upstream-commit: 818ec10da3813dfd582450093739cc4619e99b6d
Component: engine
2013-09-26 01:19:49 -07:00
