0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19492 commits 14 branches 412 tags 338 MiB
Commit graph

54 commits

Author SHA1 Message Date
Sven Dowideit
b826215c57 Merge pull request #16801 from aidanhs/aphs-add-socat-t 
Update ambassador image, use the socat -t option
 2015-10-20 14:24:25 +10:00
Aidan Hobson Sayers
ac9c0f81df Remove references to the docker-ut image 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-10-15 15:02:26 +01:00
Sebastiaan van Stijn
c45ad0b02d 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
 2015-10-11 15:35:04 -07:00
Mary Anthony
8fee1c2020 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>
 2015-10-11 07:49:54 -07:00
Sven Dowideit
50f0906007 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>
 2015-10-09 17:48:03 -07:00
Sebastiaan van Stijn
3526993b2f Merge pull request #16108 from charleswhchan/patch-2 
Touch up Node.js and MongoDB examples
 2015-10-09 15:33:30 +02:00
Yuan Sun
b08c6b1768 Replace the deprecated -d with docker daemon. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-10-08 10:25:16 +08:00
Madhu Venugopal
dd28ded711 Networking API and UX documentation 
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-10-07 03:54:27 -07:00
Aidan Hobson Sayers
f9a1c8fc64 Update ambassador image, use the socat -t option 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2015-10-06 13:42:06 +01:00
moxiegirl
1cab5a50d0 Merge pull request #16187 from mikebrow/16161-fix-text-in-docker-basics-page 
cleaning up the first few paragraphs of getting started with containers
 2015-09-27 08:02:14 -07:00
Tim Hockin
3d4685e258 Add support for DNS options 
Signed-off-by: Tim Hockin <thockin@google.com>
 2015-09-16 14:06:45 -07:00
David Calavera
60db152b20 Merge pull request #16292 from tpounds/fix-doc-typo 
Fix minor documentation typo.
 2015-09-16 11:18:17 -07:00
Jessica Frazelle
50d7fba775
Revert "Make daemon to start with no userlandproxy by default" 
This reverts commit bf2b8ec816.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-09-16 09:56:38 -07:00
Trevor Pounds
2eedaf0389 Fix minor documentation typo. 
Signed-off-by: Trevor Pounds <trevor.pounds@gmail.com>
 2015-09-14 17:08:04 -07:00
Mike Brown
ff61be9b04 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>
 2015-09-14 09:26:32 -05:00
Jana Radhakrishnan
bf2b8ec816 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>
 2015-09-11 11:58:35 -07:00
Trevor
012bdac6d6 Remove stray please 
Signed-off-by: Trevor <trevinwoodstock@gmail.com>
 2015-09-09 21:21:23 -04:00
Georgi Hristozov
e514fabfac Linux 2.6.26 is now 7 years ago :) 
Signed-off-by: Georgi Hristozov <georgi@forkbomb.nl>
 2015-09-09 15:06:02 +03:00
Charles Chan
549c8ea96e 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>
 2015-09-06 14:34:54 -07:00
Tom Barlow
b582977bc8 Updated to use correct cgroup paths 
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com>
 2015-08-27 10:39:37 +01:00
Charles Chan
b6621a1b6c 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>
 2015-08-25 21:58:20 -07:00
Ed Costello
cefb72080d Copy edits for typos 
Signed-off-by: Ed Costello <epc@epcostello.com>
 2015-08-24 23:02:44 -04:00
Mary Anthony
85c2c77188 Updating hashcode links to commands 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-08-18 12:25:59 -07:00
Dharmit Shah
0a925d07a8 Fixing docs to remove references to links under terms/ 
Removed terms/ directory

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
 2015-08-15 13:09:29 +05:30
Phil Estes
4e53e80934 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>
 2015-08-13 23:56:42 -04:00
Mary Anthony
d550d729e1 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>
 2015-08-10 17:43:41 -07:00
Qiang Huang
81cc8ebc93 Change all docker -d to docker daemon 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-10 20:48:08 +08:00
Charles Chan
ad3df49958 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>
 2015-08-08 17:28:21 -07:00
Mary Anthony
cc375a1e48 - 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>
 2015-08-05 19:45:43 -07:00
Jessica Frazelle
35e7a7c3e2 update systemd article to reference dropin file 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-08-04 11:03:43 -07:00
moxiegirl
7feb176233 Merge pull request #14539 from nhocki/improve-docs-for-execstart 
Adding information about ExecStart configuration for systemd
 2015-08-01 09:23:59 -07:00
Nicolás Hock Isaza
6b44c05205 Adding information about ExecStart configuration for systemsd 
Closes #14491

Signed-off-by: Nicolás Hock Isaza <nhocki@gmail.com>
 2015-07-31 21:28:30 -05:00
Zhang Wei
6a4ac63aaa Docker stats: display Block IO stats 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-07-31 21:26:32 +08:00
jrabbit
d2cd142ce1 Actually link to the information 
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
 2015-07-30 21:16:45 -04:00
Alexander Morozov
8505183252 Merge pull request #14950 from ottok/master 
Multiple fixes to 'docker stats' output
 2015-07-30 14:02:35 -07:00
Otto Kekäläinen
b619220ce1 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>
 2015-07-30 10:14:57 +03:00
Chander G
6cf0e27ee0 Fix minor formatting error in security article docs 
Signed-off-by: Chander G <chandergovind@gmail.com>
 2015-07-30 01:06:04 +05:30
Mary Anthony
1825e06944 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>
 2015-07-27 18:25:50 -07:00
bin liu
aa5fc634f1 Change restarting Docker daemon command in CentOS 
Signed-off-by: bin liu <liubin0329@gmail.com>
 2015-07-27 23:30:06 +08:00
Tibor Vass
e246f1e4ee Update docs to use the new docker daemon command 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-07-23 20:31:43 -04:00
Jessica Frazelle
877d740d48 update docs for new install script 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-22 15:08:14 -07:00
Charles Chan
08d5424c04 Issue #14433 
Try to improve the cache behavior for `ADD` and `COPY` commands.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-07-19 12:19:28 -07:00
Sebastiaan van Stijn
8c77e39627 Merge pull request #14571 from charleswhchan/patch-2 
Documentation: Split apt-get example onto multiple lines
 2015-07-16 18:32:56 +02:00
Charles Chan
c4d2b34d13 Split apt-get example onto multiple lines. Use extra spaces to align the code block. 
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-07-16 06:42:07 -07:00
Anatoly Borodin
5f9d1bc018 Fix a typo: change "such Bash" to "such as Bash" 
Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com>
 2015-07-15 17:10:22 +02:00
Victor Vieux
d2cde4fa66 update doc 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-08 15:42:41 -07:00
Vincent Demeester
d03923732f Fixes TOC in dockerfile_best_practices.md 
Decided to put the link in a reference word.

Closes #14573

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-13 23:46:04 +02:00
Ankush Agarwal
274c838ced Add Docker stats to runtime metrics article 
Fixes #13170

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-07-06 15:40:26 -07:00
Mary Anthony
2c5e044b59 Carries and closes 13361 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-04 18:12:52 -07:00
Jeremy Price
d612782023 fix(docs): removed extra quote character in heading 
Signed-off-by: Jeremy Price <jprice.rhit@gmail.com>
 2015-06-29 09:46:50 -05:00