Commit Graph

66 Commits

Author SHA1 Message Date
899c6bfe77 Remove mention of "apt-get clean" as it's performed automatically
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 226329e54031256958740af0ae5bc1a4f2cd9c2e
Component: engine
2015-12-14 12:50:44 -08:00
3c4fcf6b7a Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
0364b03cd5 Update configuring Docker article
Signed-off-by: Jeff Johnston <jeff.johnston.mn@gmail.com>
Upstream-commit: a77861bca7b93489dc3d804ef816b0070dbb678e
Component: engine
2015-12-12 20:36:48 -06:00
3f9a89737d Fixed broken links, and updated some to https
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: ad179e0e957a58181d71838eb0c2c7c019b4b2fb
Component: engine
2015-11-24 10:39:02 -05:00
6df421c14f Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
61aac55c3c Fix minor grammar mistake.
Signed-off-by: Ian Lee <IanLee1521@gmail.com>
Upstream-commit: ad7696a78775df7cc671113b29fb34ca66b3ace5
Component: engine
2015-11-19 12:24:25 -08:00
58a0ba7cc6 Fix invalid proxy setting example
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
Upstream-commit: d9ef4f2986b93b64289d858c55b3bee67804c444
Component: engine
2015-11-15 17:11:27 +09:00
06f47a5302 Replace now broken link with a "permalink"
Fix #17927.

Instead of pointing to a file in Docker's GitHub repo on `master`
(which got renamed, breaking the link), point to a specific version
(the current latest). As a bonus, we now highlight the most
relevant lines, without becoming more fragile.

Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com>
Upstream-commit: 6b02876362680a1acd2c0fb1fdd85183cee03f20
Component: engine
2015-11-12 19:17:29 +01:00
6027f5a756 Merge pull request #17279 from someara/articles-chef
Documenation update - articles/chef
Upstream-commit: c97ac4daf0f47e66a5a4ca0011722fdbd7efe16a
Component: engine
2015-11-10 00:56:41 +00:00
ef88e7ace2 Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
ecd671294f First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 9ef855f9e5fa8077468bda5ce43155318c58e60e
Component: engine
2015-11-02 21:14:55 -08:00
7eec452f69 Documenation update - articles/chef
Signed-off-by: Sean OMeara <sean@chef.io>
Upstream-commit: d2d40c2d9cb93379494ab31d362d01fa691d6d5c
Component: engine
2015-10-22 17:53:28 -04:00
57010d523d Merge pull request #16801 from aidanhs/aphs-add-socat-t
Update ambassador image, use the socat -t option
Upstream-commit: b826215c575e320f0cad7c07f8bfdf85437c1be9
Component: engine
2015-10-20 14:24:25 +10:00
065ee8e4a7 Remove references to the docker-ut image
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: ac9c0f81df348519ed3fba337fb862952afed58b
Component: engine
2015-10-15 15:02:26 +01:00
b34ed2cbab Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376
Default the tcp port to 2376 if tls is on, and 2375 if not
Upstream-commit: c45ad0b02d1cc1f88aaabab18aed27aeb20b9e7a
Component: engine
2015-10-11 15:35:04 -07:00
6b6c7cc2b6 Enabled GitHub Flavored Markdown
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8fee1c2020186ac100b45e64864b94ae3a169ad5
Component: engine
2015-10-11 07:49:54 -07:00
4e6b402919 Default the tcp port to 2376 if tls is on, and 2375 if not
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 50f0906007bdec83dd23b6ae5216769ab65bbf59
Component: engine
2015-10-09 17:48:03 -07:00
629317774a Merge pull request #16108 from charleswhchan/patch-2
Touch up Node.js and MongoDB examples
Upstream-commit: 3526993b2f2a490f29f291677d765face43a7bc7
Component: engine
2015-10-09 15:33:30 +02:00
ee5def44d4 Replace the deprecated -d with docker daemon.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: b08c6b17685d4af40e9705ca0efddbdffdf2657e
Component: engine
2015-10-08 10:25:16 +08:00
af07841b68 Networking API and UX documentation
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dd28ded711417c72d2e228d1ace129ac5fd05f19
Component: engine
2015-10-07 03:54:27 -07:00
6826353451 Update ambassador image, use the socat -t option
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: f9a1c8fc64901423a027b07ba692fe48118d67ce
Component: engine
2015-10-06 13:42:06 +01:00
1775a6e17a Merge pull request #16187 from mikebrow/16161-fix-text-in-docker-basics-page
cleaning up the first few paragraphs of getting started with containers
Upstream-commit: 1cab5a50d095e25b20e8ec93a13b985909f30f7d
Component: engine
2015-09-27 08:02:14 -07:00
655513db24 Add support for DNS options
Signed-off-by: Tim Hockin <thockin@google.com>
Upstream-commit: 3d4685e258a7729bd0f8cc411b5a73980a9faa20
Component: engine
2015-09-16 14:06:45 -07:00
5b99d6a57b Merge pull request #16292 from tpounds/fix-doc-typo
Fix minor documentation typo.
Upstream-commit: 60db152b209ede8e463b74459902f02d8d44e097
Component: engine
2015-09-16 11:18:17 -07:00
fd675380c0 Revert "Make daemon to start with no userlandproxy by default"
This reverts commit bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 50d7fba7758e8890d49f492c284262ec9aa22190
Component: engine
2015-09-16 09:56:38 -07:00
b8f6767a06 Fix minor documentation typo.
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
Upstream-commit: 2eedaf0389f663c8768893cd333cdd6df9e194e2
Component: engine
2015-09-14 17:08:04 -07:00
4343929089 rebased, the clean up of the first few paragraphs of getting started with containers; addressed nit
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: ff61be9b04e8e30900ac9338d7368667c97f1039
Component: engine
2015-09-14 09:26:32 -05:00
68a732e052 Make daemon to start with no userlandproxy by default
This PR makes a user visible behavior change with userland
proxy disabled by default and rely on hairpin NAT to be enabled
by default. This may not work in older (unsupported) kernels
where the user will be forced to enable userlandproxy if needed.

      - Updated the Docs
      - Changed the integration-cli to start with userlandproxy
	desiabled by default.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e
Component: engine
2015-09-11 11:58:35 -07:00
a90d6930ab Remove stray please
Signed-off-by: Trevor <trevinwoodstock@gmail.com>
Upstream-commit: 012bdac6d68f006351e43b11b258259f4af26e20
Component: engine
2015-09-09 21:21:23 -04:00
8f57866c62 Linux 2.6.26 is now 7 years ago :)
Signed-off-by: Georgi Hristozov <georgi@forkbomb.nl>
Upstream-commit: e514fabfac00798449bc07c5cdb419fd04a9c684
Component: engine
2015-09-09 15:06:02 +03:00
ed6c3923f9 Touch up Node.js and MongoDB examples
- Remove extraneous '-' in sudo note.
- Correct space formatting (minor).
- Simplify instructions for install EPEL and install with yum directly.
- Add `nodejs` to yum install list explicitly to match the comments -- more transparent for new users who might not be clear `npm` package also installs `nodejs`.
- Remove '--noprealloc` from MongoDB example as the option has been depcated since Mongo 2.6 and is now the default behaviour. See: http://docs.mongodb.org/manual/reference/program/mongod/

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 549c8ea96eb036d60e3c9eea1ed8eb2d817e885a
Component: engine
2015-09-06 14:34:54 -07:00
3fac2ae98a Updated to use correct cgroup paths
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
Upstream-commit: b582977bc8a7937a12b9064aa7fbe688b7d9c8fe
Component: engine
2015-08-27 10:39:37 +01:00
0c55d594b4 Fix #14572: Improve explaination for usng RUN and apt-get inside Dockerfil.
Based on example provided by @thaJeztah and @moxiegirl:
  https://github.com/docker/docker/pull/15773

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: b6621a1b6c79bf3338ad3fa3746e515b797565fa
Component: engine
2015-08-25 21:58:20 -07:00
cb83c53d63 Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: cefb72080d8d30a2f53ac6c7ae91d58e42210661
Component: engine
2015-08-24 23:02:44 -04:00
fdd77b46c5 Updating hashcode links to commands
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 85c2c771884aaa73b65753bdbdf31d596cd90111
Component: engine
2015-08-18 12:25:59 -07:00
ee022d610e Fixing docs to remove references to links under terms/
Removed terms/ directory

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
Upstream-commit: 0a925d07a8f87a8333ded429da656a711fd06214
Component: engine
2015-08-15 13:09:29 +05:30
2ad32c4a2a Correct readability of --userland-proxy para
Was reading this to explain it to someone and noticed the missing "s"
which makes it not so great for nice English readability..

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 4e53e80934f1813ff3e66d69fc931ed59707ffc6
Component: engine
2015-08-13 23:56:42 -04:00
ad80c7d292 Initial work
Removing references to regsitry 1.0, pointing to distribution
Updating links and title
Adding in comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d550d729e14d1a18d00b66a941da5b23b9a61bd3
Component: engine
2015-08-10 17:43:41 -07:00
8120b4d8fe Change all docker -d to docker daemon
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 81cc8ebc93c20537d5fab4c016a3774f58b3e483
Component: engine
2015-08-10 20:48:08 +08:00
763abc3713 Cleanup "Automatically start containers" page.
* Remove old information for Docker 1.2. (See PR #15408)

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: ad3df4995851df6df767798c39f880c6d0f7e7aa
Component: engine
2015-08-08 17:28:21 -07:00
26a62f2497 - Remove references to sudo in basics.md; see sudo instructions top of file
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cc375a1e48d0f4b3855e7f14b09ead244bbbadfb
Component: engine
2015-08-05 19:45:43 -07:00
5df863af84 update systemd article to reference dropin file
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 35e7a7c3e2f0e7329ef666b0e5078b39626befd2
Component: engine
2015-08-04 11:03:43 -07:00
3022ea2e8f Merge pull request #14539 from nhocki/improve-docs-for-execstart
Adding information about ExecStart configuration for systemd
Upstream-commit: 7feb176233f2cc86f249de8aa4c2e98095e8d324
Component: engine
2015-08-01 09:23:59 -07:00
7eec334052 Adding information about ExecStart configuration for systemsd
Closes #14491

Signed-off-by: Nicolás Hock Isaza <nhocki@gmail.com>
Upstream-commit: 6b44c05205a89e3208cd3a962d06641c7d52e512
Component: engine
2015-07-31 21:28:30 -05:00
712ef17493 Docker stats: display Block IO stats
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 6a4ac63aaac829e94c7d6cbb31a8d36b93757620
Component: engine
2015-07-31 21:26:32 +08:00
0ed74d6e3a Actually link to the information
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
Upstream-commit: d2cd142ce1da96589902d07fddf3a12e63631d78
Component: engine
2015-07-30 21:16:45 -04:00
0c28668f97 Merge pull request #14950 from ottok/master
Multiple fixes to 'docker stats' output
Upstream-commit: 85051832522ca217401d6eb4ddda1b1a7fdce9ad
Component: engine
2015-07-30 14:02:35 -07:00
eaafbe08a2 Multiple fixes to 'docker stats' output:
* Add space between values in docker stats output for easier parsing

  Old output could not be parsed easily because there were columns
  that did not have any separator. Also values that are together
  without any space is difficult to read even for humans.

* Update unit.HumanSize comment to match what the does actually does

Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: b619220ce11770ffaea068b54d3975c74f7c24f9
Component: engine
2015-07-30 10:14:57 +03:00
30d606b70d Fix minor formatting error in security article docs
Signed-off-by: Chander G <chandergovind@gmail.com>
Upstream-commit: 6cf0e27ee0400654addcb8e9eac963dc71846dd5
Component: engine
2015-07-30 01:06:04 +05:30
06f659e1d1 Remove references to boot2docker replace with docker-machine
- boot2docker is deprecated in the 1.8.0
- docker-machine replaces it
- this fixes #14563
- Updating with thaJetzah comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 1825e06944db20ec677aa8d26b36e9036b0dd257
Component: engine
2015-07-27 18:25:50 -07:00