centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-28 23:08:49 +07:00
Code Issues Packages Projects Releases Wiki Activity
20,092 Commits 54 Branches 28 Tags
692bfdaee3b48f4e5174bb80098692a0ded1aecf
Commit Graph

4435 Commits

Author SHA1 Message Date
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
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
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
Ian Lee
ad7696a787 Fix minor grammar mistake. 
Signed-off-by: Ian Lee <IanLee1521@gmail.com>
 2015-11-19 12:24:25 -08:00
Kamil Domański
f30364c583 allow filtering containers by any status 
Signed-off-by: Kamil Domański <kamil@domanski.co>
(cherry picked from commit 9ada6a06c57ce4ed4bfad50f603962b7b9ce6fb1)
 2015-11-19 14:11:41 -05:00
Christopher Jones
1f0dc72d4a Fixed docker network link in faq 
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2015-11-19 11:08:04 -06:00
Wen Cheng Ma
01b86d612c Update docs and test of exec create api return codes 
Fixes issue #18054

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-11-19 22:22:27 +08:00
Vincent Demeester
c32f8bb36a Merge pull request #17704 from LK4D4/default_cgroupfs 
Use fs cgroups by default
 2015-11-19 14:01:13 +01:00
Alexander Morozov
419fd7449f Use fs cgroups by default 
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-18 16:16:13 -08:00
moxiegirl
ec72163949 Merge pull request #18069 from vdemeester/fix-volume-doc-typo 
Fix a small typo in volume_inspect.md
 2015-11-18 10:14:15 -08:00
Vincent Demeester
a96be2930a Fix a small typo in volume_inspect.md 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-18 16:02:24 +01:00
David Calavera
0780ad4857 Merge pull request #17973 from moxiegirl/fix-networking-issue 
Fixing issue noted by user
 2015-11-18 12:49:11 +01:00
David Calavera
3f5e5b8f57 Merge pull request #17992 from nak3/fix-wrong-setting-in-systemd 
Fix invalid proxy setting example
 2015-11-18 12:48:41 +01:00
moxiegirl
c83373112c Merge pull request #17986 from bogdangrigg/master 
Fix small typos in documentation files
 2015-11-17 16:45:38 -08:00
moxiegirl
2ee56ce1e1 Merge pull request #18011 from lrkwz/patch-1 
Update ubuntulinux.md
 2015-11-17 16:44:33 -08:00
Alexander Morozov
662b9623c1 Merge pull request #17866 from shekhargulati/patch-1 
added rx-docker-client library
 2015-11-17 16:15:15 -08:00
Michael Crosby
104dab87ea Merge pull request #17478 from vdemeester/pr-13921 
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
 2015-11-17 15:44:57 -08:00
Jess Frazelle
aeccd45e5b Merge pull request #17419 from nathwill/cent-install-docs 
fix yum install docs
 2015-11-17 20:57:15 +01:00
Alexander Morozov
f18d5da6a7 Merge pull request #17300 from kunalkushwaha/plugin-info 
Patch for Plugin drivers in docker info
 2015-11-17 10:46:29 -08:00
gissehel
741246d69f Remove redundent lines 
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org>
 2015-11-17 18:24:17 +01:00
David Calavera
d507acb175 Merge pull request #17724 from runcom/remove-depreciated-cli-flags 
Remove depreciated cli flags
 2015-11-17 16:40:06 +01:00
Lee, Meng-Han
ea04764059 Fix Markdown syntax error in aufs-driver 
Signed-off-by: dm4 <dm4@skymizer.com>
 2015-11-17 17:38:36 +08:00
Victor I. Wood
ac526193af change "Web" to "web" to match case-sensitive name used for creation; enquoted bash cd command for un-tar example 
Signed-off-by: Victor I. Wood <viw@t2am.com>
 2015-11-16 12:41:06 -08:00
Alexander Morozov
a3065fa48f Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels 
Allow configurable metadata for Splunk log driver
 2015-11-16 10:11:27 -08:00
moxiegirl
4b706195d2 Merge pull request #17515 from azurezk/fixdoc 
fix doc of volume name conflict
 2015-11-16 09:15:50 -08:00
Andre Granovsky
be2152116c docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky <robotciti@live.com> 
Adjusted as per comment.
Rebase and squash by moxigirl

Signed-off-by: Andre Granovsky <robotciti@live.com>
 2015-11-16 08:24:26 -08:00
Luca Orlandi
fe123edb08 Update ubuntulinux.md 
Remove '*' for purge

Signed-off-by: Luca Orlandi <luca.orlandi@gmail.com>
 2015-11-16 13:29:36 +01:00
Kunal Kushwaha
aa7fd884e6 Supported added for reterving Plugin list for Network and Volume. 
Also, plugin information in docker info output.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2015-11-16 15:28:09 +09:00
Zhang Kun
82ba25bea9 fix doc 
Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix doc

Signed-off-by: Zhang Kun <zkazure@gmail.com>
 2015-11-15 23:32:40 +08:00
Antonio Murdaca
7929888214 Remove deprecated cli flags 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-15 10:40:01 +01:00
Kenjiro Nakayama
d9ef4f2986 Fix invalid proxy setting example 
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com>
 2015-11-15 17:11:27 +09:00
Luca-Bogdan Grigorescu
d1e72baa15 Fix small typos in documentation files 
Signed-off-by: Luca-Bogdan Grigorescu <bogdan@gmail.com>
 2015-11-15 00:53:27 +02:00
Vincent Demeester
49779b674a Add pkg/parsers/architecture and pkg/platform 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-14 23:03:02 +01:00
Olle Jonsson
4e8fcd4002 /info: Add keys Architecture, OSType 
- introduces Swarm-relevant keys, see #13634
  - docs updated

Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com>
 2015-11-14 22:21:45 +01:00
Alexander Morozov
f5e318a17b Merge pull request #17090 from duglin/dockerignoreWildcards 
Support multi-dir wildcards in .dockerignore
 2015-11-13 14:29:34 -08:00
Doug Davis
eddb14a44e Support multi-dir wildcards in .dockerignore 
Closes #13113

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-11-13 13:44:07 -08:00