84dc0f709d
Merge pull request #8524 from duglin/Regardless
...
Fix typo: reguardless should be regardless
Upstream-commit: 8a32aa26c1c47f3197a7dc690e16412137af95b7
Component: engine
2014-10-13 13:18:21 -04:00
9e41637039
Merge pull request #8507 from duglin/Issue3087
...
Add some docs about which env vars are defined in new containers
Upstream-commit: fe03da7da87e174a1f1635881e60da6186077289
Component: engine
2014-10-13 13:13:43 -04:00
830a3741c6
Add DOCKER_TLS_VERIFY environment variable, equivalent to --tlsverify flag
...
This makes it possible to make the Docker client "secure by default"
without wrapping the binary in a shell alias so that `--tlsverify` is
always passed.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Upstream-commit: 19fb942d3609f647adeda68c6ca106371c7b32ac
Component: engine
2014-10-13 11:49:26 +01:00
a91e1dbdcd
Add info on --device flag permissions ':rwm'
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 2709c4677c252a07d49a24f7583adcc17b38fa14
Component: engine
2014-10-13 17:41:12 +10:00
608d55c5e6
Add more info on attach inspired by discussion in #2855
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 801edfa9b8a765e734ac4a909ab032f0cb03fe87
Component: engine
2014-10-13 17:30:08 +10:00
22879cb40f
Mention the mkdocs.yml file for adding new documents
...
and move the complicated discussion about branches lower down,
hopefully most won't need to know
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 3d2f10e28ae6aa278aca4403d2e3b55cc8071022
Component: engine
2014-10-13 17:06:18 +10:00
62921e7842
README.md is a sub-section in how to build automated builds
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 3732cd6612943b39ec36ae6fc0819e7003642121
Component: engine
2014-10-13 17:00:58 +10:00
21aa32a011
Turn off editing for auto-generated index pages, and scroll the user to the right section
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 687215c32f10b85ce1c3fffef356e505daccf3f4
Component: engine
2014-10-13 16:32:18 +10:00
2f8410b378
Hide the empty sidebad TOC on the search page
...
This uses @dnephin's changes to the base.html (thank you!)
and then adds the hide_toc: page meta
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: d883fb66b04b58bf446fa2b493644d0f453829cb
Component: engine
2014-10-13 14:10:29 +10:00
3f151aca76
start sending robots.txt (and humans.txt) again, and set to dissallow if its not the real docs site
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 44e9a59665bd34f20d54e775d9afb0332bf8590d
Component: engine
2014-10-13 13:53:16 +10:00
7c9155aa4b
Add more info about the LINK env vars created
...
@SvenDowideit see what you think. I'd like to get your take on this
before I submit the PR.
Closes #4789
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 61387427cb9b1ed6a4c34e0a7960183159ee305d
Component: engine
2014-10-12 18:34:18 -07:00
011a4fae94
Fix typo: reguardless should be regardless
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ba7038c8d2a86e34bba2128b5b973864eb41c7a6
Component: engine
2014-10-12 14:41:24 -07:00
6430118dac
Fix href in docs w.r.t. cgroups freezer pointer
...
Apparently, the [...] and (http...) need to be right after each other instead
of on different lines.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b10e11f30e111e6d4ae4b439e64463e08b3ab78b
Component: engine
2014-10-12 12:59:46 -07:00
f21e8f2701
docs: fixing docker.io api
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
Upstream-commit: 137bad4b48f899cb544500bf898cbd74464a8d2f
Component: engine
2014-10-12 09:05:58 +02:00
67eb2ed955
Minor changes to SSHd example
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: f1c319f77cc4ba97ab56a7b0d1e18a4cf12db7ba
Component: engine
2014-10-11 16:30:36 -04:00
d2f7355324
Merge pull request #8505 from crosbymichael/ps-name
...
Improve ps name parsing
Upstream-commit: 246ec5dd067fc17be5196ae29956e3368b167ccf
Component: engine
2014-10-10 17:08:35 -07:00
d55dc2f6f0
Add some docs about which env vars are defined in new containers
...
@SvenDowideit FYI
Closes #3087
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 7d1e197f25d119fd8917d1867cc0284ceea46db4
Component: engine
2014-10-10 15:40:52 -07:00
e5c1195d99
reflect changes introduced in d2ffcd9 in docs
...
Docker-DCO-1.1-Signed-off-by: Brice Jaglin <bjaglin@teads.tv > (github: bjaglin)
Upstream-commit: 0099b5e68cc76080f01e9150d3a3b86e0cb2b741
Component: engine
2014-10-10 08:12:12 +02:00
0c992a32c1
Merge pull request #8384 from rhatdan/selinux-opts
...
Fix security-opt docs
Upstream-commit: 248ec5d74e4f33bbcf946609fc5f9081a267fb8b
Component: engine
2014-10-10 10:52:17 +10:00
0ef343ce97
Merge pull request #8470 from fgrehm/patch-3
...
docs: Remove `Detach` parameter from Exec Create example
Upstream-commit: 88a41aa7d1f90c75086119553b06525ab16118be
Component: engine
2014-10-09 15:25:51 -07:00
626b6d8233
Merge pull request #8482 from jfrazelle/8481-content-type-bump-v
...
Revert #8101 and #7886 (content-type:x-json-stream/line delimited json)
Upstream-commit: 917529e45e5ab1ec7f27003fda7d6d9be96995f6
Component: engine
2014-10-09 14:57:15 -07:00
ffd31097c3
Revert "Change content-type for json stream to application/x-json-stream."
...
This reverts commit 10ab2089ce189d5bea3f7aaac3b5081471309478.
Conflicts:
api/client/utils.go
docs/sources/reference/api/docker_remote_api.md
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 4c6b7cd1b560c72f2c79c28f77644f05b3ee657e
Component: engine
2014-10-09 13:17:47 -07:00
ee5a12c020
Fix security-opt docs
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: a260772e48bdb69a2e95b78fccf9ea0fd1a9898b
Component: engine
2014-10-09 15:18:28 -04:00
94e55f882a
Merge pull request #8419 from nhsiehgit/dockerfiletut
...
Dockerfiletut
Upstream-commit: 2f5f437bc12164e7fa8ff935b5b29120d4f20adf
Component: engine
2014-10-09 10:15:10 -07:00
c763054d93
added fixes to address comments
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 6a874cf711a7df5e60f1290e02fe4ca25851b985
Component: engine
2014-10-08 13:46:44 -07:00
d2ff407b2f
Squashed commit of the following:
...
commit 3f9e9185fe7ee51f2fe55f0fc0d4fffdc4f289dc
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 10:57:35 2014 -0700
changed the title of back buttons
commit f86934424e85931ec293e711ceaa93ee920828fb
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 10:53:15 2014 -0700
Finished level 2, refactored tests
commit 8f502bce05293cccaf200b69ce5f5826eee72484
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Mon Oct 6 08:52:37 2014 -0700
stylized better and added level 2
commit 07b2276b346c34c0cc0faa57500c40e120e77888
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 18:17:29 2014 -0700
broke tutorial tests styles
commit 35d84147dc2f65b0ffeea5faf304add903219b1e
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 17:23:48 2014 -0700
structured test level1 md file
commit 808d01b0d55d67eb1017f290a29da6c7d38565f2
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Fri Oct 3 17:15:46 2014 -0700
Modified files and integrated tutorial through new page
commit 0f0093f2882489c3eeb6f8870f2b8aa64dc939a3
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 14:34:44 2014 -0700
more refactoring
commit 5a9b98e55ebd455ccf2c0ced20f984545a0b6d71
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:46:58 2014 -0700
clean js code
commit af3bbd8d5e1dffdaa1780f83b909ff566906e513
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:26:39 2014 -0700
level 1 cleanup
commit c4852a7766ab4fbd978d65c8352ace05eb427ef5
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Thu Oct 2 11:20:17 2014 -0700
fixed up fill-in level1
commit 7f02d80942549dec9c05f784b777fcb32d5bb81b
Author: Nathan Hsieh <hsieh.nathan@gmail.com >
Date: Wed Oct 1 17:45:42 2014 -0700
added dockerfile tut, stylized lesson1 Questions
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: c257dcc9a4a78aa4455fbd417d0f80b2efb4713a
Component: engine
2014-10-08 13:46:44 -07:00
34b246475b
merged conflicting commits
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: 8ceb213b3e86973c795ec87a724c7dc7a794d57e
Component: engine
2014-10-08 13:44:21 -07:00
f823d93515
docs: Remove Detach parameter from Exec Create example
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
Upstream-commit: 2fd0e8eb5f062bd549f961122d172ecdf1ae085e
Component: engine
2014-10-08 10:31:12 -03:00
33d0e956f0
Add a best practice to reduce cache invalidations
...
inspired by https://github.com/docker-training/docker-fundamentals/pull/206
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a36ba19ccad8ea551a912ce16921af89d9e59012
Component: engine
2014-10-08 11:26:48 +10:00
3c1879f50c
Merge pull request #8437 from SvenDowideit/un-pto-sven-oct-2014
...
back from camping, and making fred the docs 'guy in charge'
Upstream-commit: c2428ff8653cba5bb3aef4ace7066fa6fdb916b0
Component: engine
2014-10-07 20:01:26 -04:00
82382ec8c3
back from camping, and making fred the docs 'guy in charge'
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 9b5e6d40f5996a13f8e45e63f9dd4a9acae6061a
Component: engine
2014-10-07 15:54:30 +10:00
b1a8fc982d
Merge pull request #8382 from jamtur01/cli
...
Multiple fixes to the cli.md document.
Upstream-commit: 7813f85e7d6ef4194cee1c1a5d32b649c6483287
Component: engine
2014-10-07 15:07:57 +10:00
ad9bf25691
Merge pull request #8304 from davide-ceretti/chore/prettify-docs-update.py
...
Prettify docs-update.py
Upstream-commit: 8f58025b704dfc98988ba9daaecd40dfa5f7e98d
Component: engine
2014-10-07 14:30:24 +10:00
6c9c0cbd11
Merge pull request #8341 from unclejack/add_workdir_test
...
add test for workdir env vars and add docs
Upstream-commit: 40cad37f0a4f182150476a577196af29da142fc1
Component: engine
2014-10-07 14:27:32 +10:00
9b33845098
google: fix typo
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 0a056a31faa194998a1d4499c4f6ad292cadd3b3
Component: engine
2014-10-06 15:28:50 -07:00
651e773954
Merge pull request #8343 from duglin/Issue5278
...
Make fixed font sizes smaller per Issue #5278
Upstream-commit: 3fc04f36e528599a7093a30dd35d920863762fed
Component: engine
2014-10-06 10:11:01 -07:00
6089ee6989
Make fixed font sizes smaller per Issue #5278
...
Closes #5278
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 9c201c5836fcee4455806a06fbada17cabd4296d
Component: engine
2014-10-06 06:49:33 -07:00
712eaeae70
Merge pull request #8388 from merty/patch-1
...
Fixed a typo in "Installing Docker on Mac OS X"
Upstream-commit: 44264f48e43bd556636326229e7e11c0fb8a23e1
Component: engine
2014-10-03 22:03:50 -04:00
4bc322dfa5
Merge pull request #8360 from duglin/Issue5509
...
Add note to docs about lack of shell processing in JSON form - Issue 5509
Upstream-commit: 62391d68a4b9c1dafd52d087a03cf3a847a4f477
Component: engine
2014-10-03 22:03:31 -04:00
f49339f3ba
Merge pull request #8222 from fredlf/adding_official-repo-guidelines
...
Edits and fixes based on review.
Upstream-commit: 95e169a6a14b46c9db6b6d316524b28abfdc3391
Component: engine
2014-10-03 22:03:05 -04:00
d02e9b822c
Multiple fixes to the cli.md document.
...
*. Fixed headings so the side menu will now be consistent. Some sections
had H3s that were displaying and others did not leaving the left menu
very mismatched.
* Fixed several spelling errors.
* Re-formatted several long lines and badly laid out paragraphs.
* Fixed several double backticks.
* Added backticks to several outputs and variables.
* Removed two issues that are no longer valid.
* Removed several double spaces and extra lines.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: ee101c3b2c9efdd0f11e4e96659db18ada3734c8
Component: engine
2014-10-03 16:28:43 -04:00
5187532659
Fixed a typo in "Installing Docker on Mac OS X"
...
evironment -> environment
Upstream-commit: 81cddaaa7ddd09cd928529e988df28d17a180203
Component: engine
2014-10-03 23:18:40 +03:00
ddc310264c
Merge pull request #8375 from fgrehm/patch-2
...
docs: Update `docker exec` examples
Upstream-commit: 94da44cacf189de091509d73298cfdc19fda557e
Component: engine
2014-10-03 11:30:37 -07:00
b84c9439ff
Merge pull request #8336 from kwk/improve_docs_with_note_about_registry_frontend_web_app
...
Improve docs with note about registry frontend web app
Upstream-commit: 23dc2ca2d5eb74675acf44f0f8b7a8a666c13263
Component: engine
2014-10-03 11:00:32 -07:00
16bdc4eee3
Add note to docs about lack of shell processing in JSON form
...
Closes #5509
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 98ceae1a8499979f725bd04dfbc47ccf831331a7
Component: engine
2014-10-03 05:18:25 -07:00
b21689409c
docs: Update docker exec examples
...
Signed-off-by: Fabio Rehm <fgrehm@gmail.com >
Upstream-commit: 6480b30a997a8fe9884504f669b9c5a68d887f55
Component: engine
2014-10-03 01:13:59 -03:00
02413ae0ec
Merge pull request #8351 from kencochrane/8347_fix_broken_doc_build
...
Fixed issue with docs not getting built due to ssl error.
Upstream-commit: 8a0733ce69a12cd129953b903c106ac0f85b818d
Component: engine
2014-10-02 15:58:18 -07:00
6da135ab37
Edits and fixes to Dockerfile Best Practices based on review feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 36db0a30fa471aa96cf5acd8139b554db78cec22
Component: engine
2014-10-02 14:08:39 -07:00
cf801a51a6
Typo: changed "Maintainers" to "maintainers"
...
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com >
Upstream-commit: e08f22cdb2b1e10661f76582f9a8ba7d1cb80bea
Component: engine
2014-10-02 08:43:30 +02:00
fd74b5fbc9
Fixed issue with docs not getting built due to ssl error.
...
Signed-off-by: Ken Cochrane <ken@docker.com >
Upstream-commit: 7f261ebe6cc60c01fd10f5f86f1c22d512be3f5f
Component: engine
2014-10-01 21:11:10 -04:00