centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-29 07:18:51 +07:00
Code Issues Packages Projects Releases Wiki Activity
20,203 Commits 54 Branches 28 Tags
a489e685c0d17455463945316cfe366e4e65dca6
Commit Graph

4468 Commits

Author SHA1 Message Date
Sven Dowideit
ce5177cf4b Use FROM docs/base:latest again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-26 20:20:46 +10:00
David Calavera
ad67f324cc Merge pull request #17799 from runcom/deprecate-hc-cont-start 
Deprecate HostConfig at API container start
 2015-11-25 09:11:12 -08:00
Sebastiaan van Stijn
9bd5fd8926 Merge pull request #18223 from thaJeztah/fix-table-markup 
Fix markup for markdown table
 2015-11-25 16:26:53 +01:00
Sebastiaan van Stijn
aa4fa98ed7 Merge pull request #18233 from moxiegirl/carry-17231 
Moving prerequisite from #17231
 2015-11-25 16:12:05 +01:00
Vincent Demeester
1892556375 Merge pull request #18209 from martingkelly/18207-deb-multiarch 
install.sh: fix for multiarch deb/ubuntu
 2015-11-25 16:02:36 +01:00
moxiegirl
afaf288316 Merge pull request #17926 from HackToday/15896-fix-volume-options 
Fixing the volume options doc
 2015-11-25 06:57:05 -08:00
Mary Anthony
20f1a7b496 Moving prerquisite from #17231 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-25 06:51:23 -08:00
moxiegirl
1c3e4c5b9f Merge pull request #17231 from zelahi/9745-addapparmor-note 
Adding note about apparmor install on Ubuntu
 2015-11-25 06:45:42 -08:00
James Turnbull
9cbfa7b00b Merge pull request #18227 from thaJeztah/fix-api-changes 
docs: move API changes to the correct API version
 2015-11-25 08:20:13 -05:00
Sebastiaan van Stijn
a06d5273b3 docs: move API changes to the correct API version 
These changes were made as part of https://github.com/docker/docker/pull/17478
but inadvertently added to the v1.21 API version.

Also added a short description to the API changelog.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-25 14:10:18 +01:00
Sebastiaan van Stijn
0a7e45e95c docs: fixups for plugin drivers in docker info 
Plugin drivers were added to docker info in
https://github.com/docker/docker/pull/17300

but not added to the example output in the online
docs.

Also fixed mixed tabs/spaces in the API documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-25 13:54:54 +01:00
Sebastiaan van Stijn
bfdd94b0a8 Fix markup for markdown table 
Our tooling used to convert Markdown to HTML doesn't
properly handle '|' symbols embeded in code blocks
inside a table.

Changed the table to a plain HTML table as a workaround.

Also fixed indentation levels of two code examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-25 12:38:15 +01:00
Kai Qiang Wu(Kennan)
41a36529a7 Fixing the volume options doc 
Fixes #15896
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2015-11-25 03:56:55 -06:00
Zuhayr Elahi
0480da4d8c 1. Adding note about apparmor install on Ubuntu 
2. modified page to remove note for apparmor and added it as a requirement for installing it on ubuntu
3. moved note to under prerequisites section

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
 2015-11-24 22:53:14 -08:00
Martin Kelly
3e5ac74241 install.sh: fix for multiarch deb/ubuntu 
Currently, the Docker repos will trigger apt-get errors on a
multiarch-configured deb system because the repos don't contain all
architectures. For example, on a multiarch system supporting amd64 and
armhf, apt-get will look for armhf Docker packages, fail to find them,
and error out.

Fix this by qualifying the repo line with the currently active
architecture.

This fixes issue #18207.

Signed-off-by: Martin Kelly <martin@surround.io>
 2015-11-24 16:53:13 -08:00
Christopher Jones
ad179e0e95 Fixed broken links, and updated some to https 
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2015-11-24 10:39:02 -05:00
Wen Cheng Ma
4d66f18be0 Correct some typos for docs 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-11-24 15:14:32 +08:00
Morgan Bauer
e28e4c7840 update 'top' api endpoint documentation 
- update example based on '-ef' behavior
 - new example specifying ps args 'aux'
 - resolves #7205

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-11-23 15:41:34 -08:00
James Turnbull
097bc4881f Merge pull request #18167 from duglin/FixTagHelp 
Add more to tag's -f flag's help
 2015-11-23 11:59:22 -05:00
James Turnbull
2bc792e3bb Merge pull request #18132 from WeiZhang555/api-changelog 
Add API change to docs
 2015-11-23 11:57:46 -05:00
Doug Davis
5bf4766fca Add some docs about build-arg's impact on the cache 
Closes #18017

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-11-23 08:51:11 -08:00
Doug Davis
a70079ea23 Add more to tag's -f flag's help 
Was noticed in #9798

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-11-23 07:20:10 -08:00
Zhang Wei
bfe711bed3 Add API change to docs 
Add API change description to docs due to `docker network inspect`
returns different data structure.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-23 22:42:55 +08:00
Sebastiaan van Stijn
1d1de645fd Merge pull request #18137 from vanpire110/master 
Update understanding-docker.md again
 2015-11-23 09:31:13 +01:00
Vincent Demeester
a600bf4eab Merge pull request #17489 from WeiZhang555/network-rm-multi 
Enhance `docker network rm` to delete multi net
 2015-11-23 08:25:33 +01:00
moxiegirl
0f58421901 Merge pull request #18155 from SvenDowideit/docs-validation-fixes 
Fixes found by docs validation tool
 2015-11-22 19:39:09 -08:00
Sven Dowideit
f4b2da0145 Merge pull request #18149 from jeffdm/master 
Mark Windows 10 as supported in installation docs
 2015-11-23 12:09:00 +10:00
Sven Dowideit
043f447e2e Fixes found by docs validation tool 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-23 11:19:38 +10:00
Mark McKinstry
196bd38fdb use variable instead of hardcoding version in repo 
Signed-off-by: Mark McKinstry <mmckinst@umich.edu>
 2015-11-22 11:30:18 -05:00
Zhang Wei
e7eb6687ef Enhance docker network rm to delete multi net 
This commit enhance `docker network rm` command to allow user to delete
multi networks at the same time.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-22 05:37:00 +08:00
Jeffrey Morgan
414c8565be Mark Windows 10 as supported in install docs 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
 2015-11-21 13:42:32 -05:00
Antonio Murdaca
3ff9bb5332 Merge pull request #16613 from WeiZhang555/docker-cp-symlink 
Add option `-L` to allow `docker cp` follow symbol link
 2015-11-21 17:03:24 +01:00
Jeremy Qian
f5343a039b update docs/introduction/understanding-docker.md 
Signed-off-by: Jeremy Qian <vanpire110@163.com>
 2015-11-21 10:43:25 +08:00
David Calavera
7caa313c82 Merge pull request #18127 from KostyaSha/patch-1 
Add Dead state to Container Inspect 1.21 API
 2015-11-20 14:39:25 -08:00
Antonio Murdaca
6653f82796 Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates 
modifying docker --since and --until to support nanoseconds and time …
 2015-11-20 23:37:44 +01:00
Kanstantsin Shautsou
836d0127fd Add Dead state to Container Inspect 1.21 API 
Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>
 2015-11-21 00:06:37 +03:00
moxiegirl
d395134b3d Merge pull request #18094 from tophj-ibm/faq-link-fix 
Fixed docker network link in faq
 2015-11-20 12:13:07 -08:00
Antonio Murdaca
3e7405aea8 Deprecate HostConfig at API container start 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-20 20:45:55 +01:00
David Calavera
8fa09749fb Merge pull request #17718 from wenchma/17716_before_filter_doc 
Re-implement --before and --since as options for --filter
 2015-11-20 11:24:19 -08:00
Jess Frazelle
c1f11f8144 Merge pull request #18109 from phemmer/yum-docs-fix 
remove unnecessary echo from yum docs
 2015-11-20 13:10:55 -05:00
Alexander Morozov
a76bdea21b Merge pull request #16168 from NIWAHideyuki/16164-shm-size 
Addition of "--shm-size" to which size of /dev/shm is changed
 2015-11-20 10:01:48 -08:00
Zhang Wei
92600bdec1 Add '-L' option for cp 
Fixes #16555

Original docker `cp` always copy symbol link itself instead of target,
now we provide '-L' option to allow docker to follow symbol link to real
target.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-21 00:36:56 +08:00
Sebastiaan van Stijn
7a1b05ccce Merge pull request #18101 from IanLee1521/patch-1 
Fix minor grammar mistake.
 2015-11-20 11:43:42 +01:00
Sebastiaan van Stijn
d8ea32caa8 Merge pull request #18026 from woodvi/doc-network-tutorial 
change "Web" to "web" to match case-sensitive name used for creation;…
 2015-11-20 10:46:00 +01:00
Sebastiaan van Stijn
20905ec452 Merge pull request #17861 from gissehel/apt-source-doc 
explicit way to express that docker.list are different choices and not just one big file
 2015-11-20 10:06:13 +01:00
Wen Cheng Ma
1921c62938 Re-implement --before and --since as options for --filter 
* This commit will mark --before and --since as deprecated, but leave their behavior
  unchanged until they are removed, then re-implement them as options for --filter.

* And update the related docs.

* Update the integration tests.

Fixes issue #17716

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-11-20 13:10:13 +08:00
Patrick Hemmer
3cbccccb37 remove unnecessary echo from yum docs 
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
 2015-11-19 20:51:43 -05:00
Mary Anthony
9941d5bc33 Small changes to storage driver/commands ref 
Entering V's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-19 17:13:23 -08:00
NIWA Hideyuki
5aeaf2a0c4 Addition of "--shm-size" to which size of /dev/shm is changed. 
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
  when container is made.
- Being able to specify is a numerical value that applies number,
  b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.

Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com>
 2015-11-20 09:24:18 +09:00
Alexander Morozov
8e6e38990c Merge pull request #18084 from wenchma/18054_exec_start_fix 
Update docs and test of exec create api return codes
 2015-11-19 13:51:46 -08:00