6e470bbbd0
Merge pull request #4468 from bcbcarl/4467-dockerjs-outdated
...
Flag 'docker-js' as outdated (Fix #4467 )
Upstream-commit: 8d947da826498fb4b563edb1e68396c821238a39
Component: engine
2014-03-06 09:37:34 +10:00
41674425c0
Merge pull request #4463 from tianon/update-packagers-doc-and-lxc-dep
...
Update PACKAGERS.md and hack/make/ubuntu
Upstream-commit: d03be9d7cf95bffff024a4be54f6c928f76adea9
Component: engine
2014-03-05 16:15:16 -07:00
e13d9e18a0
Merge pull request #4444 from SvenDowideit/update-host-integration-docs
...
update to use --name, and add a little more detail to how docker start -a works
Upstream-commit: 34fe14f1746903e5775a2e34ebb1176a885dc380
Component: engine
2014-03-05 12:30:55 -08:00
60c64fda87
Merge pull request #4392 from SvenDowideit/small-doc-fixes
...
Small doc fixes
Upstream-commit: ac734f0d36542cef241226218fde2ab2b8c191e9
Component: engine
2014-03-05 12:29:46 -08:00
cb1dbed1c9
Flag 'docker-js' as outdated
...
Upstream-commit: 5e32c40795e527cc2e916fe5b8970b37e9485266
Component: engine
2014-03-05 20:16:41 +08:00
5cfec2c466
Update the relevant docs section to match PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 4293a1ceb476ce4a8621ac1500a3623328fb5b97
Component: engine
2014-03-04 22:54:58 -07:00
59e55af69a
Closes #4374
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
\nDocker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: )
Upstream-commit: 83de8bb842b97094651207202a5474b8fec5259f
Component: engine
2014-03-05 02:41:14 +00:00
821bf64ace
Consistently capitalize CLI options
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 41bf38e44d8ef53468e76870182fa05c515a1cf5
Component: engine
2014-03-04 20:22:51 -05:00
eed6462b7a
update to use --name, and add a little more detail to how docker start -a works
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 3acbd758d84294e3434609ae3ecf52cd5ed9ee4b
Component: engine
2014-03-05 00:57:08 +00:00
91922e3e79
Merge pull request #4438 from crosbymichael/update-docs
...
Update daemon docs for exec drivers
Upstream-commit: 20ddd34d0533ca05e3d09c5d4a8414033d69cfba
Component: engine
2014-03-04 07:56:30 -05:00
5207105b8e
Merge pull request #4415 from iantruslove/patch-1
...
Fix minor typo
Upstream-commit: fbc00df7a0cc500314bd9dd5fca2fe54d011033f
Component: engine
2014-03-03 17:58:03 -08:00
84d85e3b67
Update daemon docs for exec drivers
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 0f96a749ab812d76389c4a48c71ff9a01e48488e
Component: engine
2014-03-03 17:43:08 -08:00
e06ddb9508
Merge pull request #4382 from unclejack/fix_symlink_handling
...
handle symlinks for Docker's root dir & TMPDIR
Upstream-commit: d761ebea6f4122bd0592267f2a5fe907a86cd338
Component: engine
2014-03-04 03:23:11 +02:00
111101411b
Merge pull request #4413 from jamtur01/exemption
...
Added documentation (and some cleanup) around small patch exemptions
Upstream-commit: fca4cf6f0aa50f8bac307fa72faca9f137cbb4b5
Component: engine
2014-03-04 09:10:37 +10:00
04d68b69ad
handle symlinks for Docker's root dir & TMPDIR
...
This removes the incomplete symlink handling from engine.go and it adds
it one place in docker.go.
It also enables handling symlinks for TMPDIR.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 611acf7a7c1c3a6796e862fb94143890a9aa4573
Component: engine
2014-03-03 23:00:53 +02:00
085a080854
Merge pull request #4385 from khia/json_format
...
Support json output in --format flag of docker inspect
Upstream-commit: 37d0ce42c689d3691824c92db81b9c7c9cd98479
Component: engine
2014-03-03 12:36:47 -08:00
5d5ad8f867
Merge pull request #4321 from vieux/docker_run_-it
...
Add support for docker run -it or docker images -qa
Upstream-commit: 7531f82c70e44ac93d540c380ecfd2a52980f86f
Component: engine
2014-03-03 20:52:10 +02:00
2aae4c5f25
Merge pull request #2 from SvenDowideit/docker_run_-it_docs
...
add a little bit mentioning commandline option combinations
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 954a913c1f32c604037c81279afaf15080873447
Component: engine
2014-03-03 18:48:47 +00:00
47387bf105
Merge pull request #4406 from funkymonkeymonk/voldocs
...
adding note that host-volumes must be defined using absolute paths
Upstream-commit: 37893c3db08eb563af89939ca5f545ddd038f69f
Component: engine
2014-03-02 23:19:09 -05:00
1c9accc818
Fix minor typo
...
Upstream-commit: 3de1d25c11c592510cd1be3c8c2e7fa754305484
Component: engine
2014-03-02 13:32:48 -07:00
69c5fbdfef
Added documentation (and some cleanup) around small patch exemptions
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: b187d7ae41a1f946d536b42108ec082541883d26
Component: engine
2014-03-02 11:43:18 -05:00
b706d63e16
adding note that host-volumes must be defined using absolute paths
...
Docker-DCO-1.1-Signed-off-by: Will Weaver <monkey@buildingbananas.com > (github: funkymonkeymonk)
Upstream-commit: 3ddfbf68802b7a62dcdefd46decb3f7f6faebabe
Component: engine
2014-03-01 20:43:53 -05:00
9a5ac39c28
Support json output in --format flag of docker inspect
...
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com > (github: khia)
Upstream-commit: e07920f680a829724f617819f0c5715ed9b5194a
Component: engine
2014-02-28 17:34:31 -08:00
40e0f3f694
add some info wrt backup and restore of volumes
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5fde31ba9cca63a6bdf0a11fffa64aa16229ef66
Component: engine
2014-03-01 08:44:01 +10:00
a28a17100c
Merge pull request #4390 from SvenDowideit/spelling-1
...
one ponted out by lukaspustina, and one that I bet I added
Upstream-commit: ba2a042aea3d8bb03b3e09e7eb7c6357c754bea0
Component: engine
2014-02-28 13:39:40 -08:00
d02adb2017
Merge pull request #4319 from jlhawn/docs-docker-io-api
...
Added documentation for docker.io OAuth & Accounts
Upstream-commit: 70d2ca4ed39945fbef2337260b0123bdfabc9561
Component: engine
2014-02-28 13:35:33 -08:00
e7b76315fc
one ponted out by lukaspustina, and one that I bet I added
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: b16f46635459b9e6f58a733e39ccb21c767d8e33
Component: engine
2014-03-01 05:12:21 +10:00
d41cda6cb2
Updated OAuth docs per arothfusz's comments
...
Added emphasis of https for OAuth interactions.
Updated example URIs to use HTTPS
Included redirect hostname on authorization page.
Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: b6a5082bd1cfa297637b38aa6692239a679d97e8
Component: engine
2014-02-27 14:21:24 -08:00
f4bfb3c930
add a little bit mentioning commandline option combinations
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: cdec3297f7f06fb383c1be1aaec67417a2d4c7f9
Component: engine
2014-02-28 08:14:22 +10:00
e36ff12382
Merge pull request #4318 from robpc/patch-1
...
Fixed typo in Dockerfile example
Upstream-commit: ce8a7352488ede9e78ab0dde642577b506bf28a1
Component: engine
2014-02-27 10:19:09 -08:00
d011a4181c
Fixed typo in Dockerfile example
...
Docker-DCO-1.1-Signed-off-by: Rob Cannon <rpcann@gmail.com > (github: robpc)
The 'true' command is located in /bin not /usr/bin in the busybox image.
Upstream-commit: 1475dafd5204a6df2e69dec5214270020edf5e50
Component: engine
2014-02-26 19:38:51 -05:00
a01a267fdb
Merge pull request #4078 from vieux/rewrite_rmi
...
Rewrite docker rmi
Upstream-commit: bde192bb80079ad89057a6df5ce676c5b3429901
Component: engine
2014-02-26 21:30:24 +02:00
1d5826bd31
Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build
...
make docker build -rm=true default
Upstream-commit: 31ddc1669250565bdf41bc5329d16eb7e5bd7227
Component: engine
2014-02-26 19:03:59 +02:00
0eecb77d00
make docker build -rm=true default #4292
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 0b4aeb79d9e920f5a713a8ae57e3fdde011689e6
Component: engine
2014-02-26 11:04:06 -05:00
7c7e0318a0
Merge pull request #4323 from timruffles/patch-2
...
help contributors be more productive
Upstream-commit: d373cb8c89f40a6d293cbb01b094c4e947057343
Component: engine
2014-02-25 15:03:30 -08:00
cae176477e
add missing doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 10faefac3b88069f22283f3f2e018d100a66f2b9
Component: engine
2014-02-25 21:08:08 +00:00
4637d495ff
fix doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 21f56c04e4f4df4e171985896b54b243c6ef0fcb
Component: engine
2014-02-25 21:08:08 +00:00
0820020142
bump API version
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: e7cc88c39f302c020f70a00bca54bddeecb608a4
Component: engine
2014-02-25 21:08:07 +00:00
781668c938
Merge pull request #4189 from vbatts/vbatts-execdriver_flag
...
execdriver flag for docker daemon
Upstream-commit: c9addff4449d0d6671373b9a6376fbe94bb43fb4
Component: engine
2014-02-24 23:28:17 -05:00
f820af7110
help contributors be more productive
...
certainly saved me time after I found this in hack/make.sh :)
Docker-DCO-1.1-Signed-off-by: Tim Ruffles <oi@truffles.me.uk > (github: github_handle)
Upstream-commit: 9c4799b7e7627b21f2748458e46d697c3ee4981e
Component: engine
2014-02-24 23:07:40 +00:00
9ab15c1e2d
Added documentation for docker.io OAuth & Accounts
...
OAuth docs:
documented the OAuth authorization flow and how to register your application
Account docs:
documented getting/updating user profile data
documented getting/updating user email data
Docker-DCO-1.1-Signed-off-by: Josh hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 00bb76f35b4d21d0aaddb23f93d663ec02faea1a
Component: engine
2014-02-24 13:48:43 -08:00
ccb00fe481
Merge pull request #4281 from unclejack/remove_vagrantfile
...
Remove Vagrantfile and remove it from all docs
Upstream-commit: 8cfa7715c738756af8a0d5732fe7716882da3a95
Component: engine
2014-02-24 11:39:11 -08:00
09b4fa1ad0
Remove uneeded wording in Dockerfile format
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: cfdfd46e49404ad9dfb28810bd7a83658f35c42b
Component: engine
2014-02-23 15:45:44 -05:00
2cf8cc3b3a
Remove Vagrantfile and remove it from all docs
...
This removes the Vagrantfile and updates the documentation to remove
the steps which explain how to install Docker in a VM via Vagrant.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 67d55860a52bec8b1a1327355b4f27674ec912aa
Component: engine
2014-02-22 03:25:32 +02:00
64257510ad
Merge pull request #4245 from manuel-woelker/docs-remote-api
...
Added some documentation for the JSON params in the /containers/create and /containers/(id)/start remote APIs
Upstream-commit: f36d455144469a8c7574afe6d9932c530fc84da8
Component: engine
2014-02-22 10:15:20 +10:00
dd7ff4fc5b
Merge pull request #4280 from dpb587/bugfix-mtu-typo
...
Fix argument usage typo for docker --mtu
Upstream-commit: 36fd9f3c53621f27ee5346ef52a6dde6d8e1d580
Component: engine
2014-02-21 10:59:42 -08:00
5cecf0201f
Merge pull request #4277 from SvenDowideit/tianon-made-me-doit
...
small update to API docs to go with #4276
Upstream-commit: 0c8c87d9ff8a4dcc794c137d69ef3fd91527035e
Component: engine
2014-02-21 10:57:51 -08:00
773b1a3574
Drop -mtu from docs in favor of --mtu only
...
Docker-DCO-1.1-Signed-off-by: Danny Berger <dpb587@gmail.com > (github: dpb587)
Upstream-commit: afb565e97c79b87d4563e8e728513ca5b50514c7
Component: engine
2014-02-21 13:43:50 -05:00
1377718158
docs: document some JSON parameters /containers/create and /containers/(id)/start in remote api ( fixes #2948 )
...
Docker-DCO-1.1-Signed-off-by: Manuel Woelker <github@manuel.woelker.org > (github: manuel-woelker)
Upstream-commit: c3faab3955a6cfb5b36249889269dd8d272e9e8b
Component: engine
2014-02-21 19:25:49 +01:00
bd08308ce7
Merge pull request #4260 from unclejack/onbuild_fixes
...
forbid chained onbuild, from & maintainer triggers
Upstream-commit: ab63975b8e4153f65cc9ce200f20c39caec08664
Component: engine
2014-02-21 12:50:40 -05:00
