docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-14 04:50:52 +03:00
Code Activity
47,845 Commits 124 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
e9da790f76 Merge pull request #1660 from mnowster/754-add-option-memswap-limit 
Add in memswap_limit run option
 2015-07-07 10:09:49 +01:00
zmarouf
3bee3a2927 fix(docs): Small typoes in the Supported installation page 
-> https://docs.docker.com/installation/

Signed-off-by: Zeid Marouf <zeid.marouf@gmail.com>
 2015-07-07 11:09:12 +02:00
Yuan Sun
f244ed2531 Correct wrong comment of TestPushBusyboxImage. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-07-07 16:10:37 +08:00
Sebastiaan van Stijn
270d7e1af8 Merge pull request #14406 from duglin/tweakCmdlineHelp 
Fix example in cmdline help text to have correct output
 2015-07-07 09:26:13 +02:00
Sebastiaan van Stijn
244141a8aa Merge pull request #13987 from larsks/bug/7583 
Update docker commit man page re: volumes
 2015-07-07 09:16:54 +02:00
evalle
0db7c2a9a6 Adding Group Metatag 
Signed-off-by: evalle <shmarnev@gmail.com>
 2015-07-07 09:08:55 +02:00
Harald Albers
ea26b38784 Add some missing events to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-07-07 09:04:15 +02:00
Sebastiaan van Stijn
81964ca555 Merge pull request #14275 from ankushagarwal/runtime-metrics-docs-stats 
Add Docker stats to runtime metrics article
 2015-07-07 08:21:31 +02:00
Sebastiaan van Stijn
a25ee91f1c Merge pull request #14095 from timwraight/master 
Clarify .dockerignore example for Markdown files
 2015-07-07 07:59:39 +02:00
Kir Kolyshkin
68efb27e99 daemon.md: fix placement of exec driver heading 
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2015-07-06 22:51:31 -07:00
Kir Kolyshkin
7e309aed4e README.md: fix cgroups/namespaces name and link 
The features Docker relies on are called "cgroups" and "namespaces",
so fix the language accordingly.

Also for cgroups, provide a link to Linux kernel documentation that
is more relevant (and deep) than the Wikipedia article.

Cc: Ankush Agarwal <ankushagarwal11@gmail.com>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
 2015-07-06 22:45:56 -07:00
Peeyush Gupta
fa0cc6d1df Fixing spelling of again 
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
 2015-07-07 11:09:39 +05:30
Diogo Mónica
ce0ed53fa2 Merge pull request #30 from endophage/rufus_update 
populate key and signature type from rufus's Algorithm field
 2015-07-06 22:29:06 -07:00
Jana Radhakrishnan
c6dc6bcbb8 Vendoring libnetwork 
Vendoring libnetwork commit: 8fb0a8bc9e3166216ca3da2d0bb15332f6685745
    - Fixes breakage in k/v store handling logic in experimental
    - Adds back all the fixes that went in 1.7.1 to master
    - Change VXLAN port in overlay driver to IANA assigned port

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-07-06 20:53:03 -07:00
Xian Chaobo
0037c31a95 fix func name and use extracExprs 
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
 2015-07-07 11:30:26 +08:00
Lei Jitang
2802831218 Fix test TestEventsDefaultEmpty. Fixes #14360 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-07 11:27:00 +08:00
Doug Davis
58edd21c05 Merge pull request #14409 from vdemeester/fix-testRequires-network 
Fix integration tests with testRequires(c, Network)
 2015-07-06 23:08:34 -04:00
David Lawrence
0b331490d7 populate key and signature type from rufus's Algorithm field 
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
 2015-07-06 20:00:52 -07:00
Martin Schygulla
66114abb0d Improved handling of boot delays until VM comes online 
Signed-off-by: Martin Schygulla <martin.schygulla@gmail.com>
 2015-07-07 04:18:49 +02:00
John Howard
f4b08c7f5e Windows: Win32 event for sigusr1 linux equivalence 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-06 18:58:53 -07:00
Alexandre Beslic
151bb84316 Merge pull request #1034 from vieux/return_systemtime 
/info now returns SystemTime
 2015-07-06 19:34:34 -06:00
Victor Vieux
0268b1ce89 /info now returns SystemTime 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-06 17:56:35 -07:00
Evan Hazlett
306aed635d Merge pull request #1477 from nathanleclaire/lil_doc_fixups 
Fix some docs issues
 2015-07-06 20:54:52 -04:00
Doug Davis
aea0fd0115 Fix example in cmdline help text to have correct output 
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-07-06 17:51:09 -07:00
Victor Vieux
edb72d0744 always override hostname in mesos 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-06 17:35:53 -07:00
Jeffrey Morgan
b466b880c6 Add Kitematic 2015-07-06 17:31:58 -07:00
Derek McGowan
35081ea4b6 Fix duplicate layers in manifest 
Currently the layer array is initialized with the first layer then the first layer is appened to the layer list. Adding the first layer twice causes the layer to appear twice in the manifest, making a duplicate push and pull attempt occur.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2015-07-06 17:31:06 -07:00
Victor Vieux
6be45b2ba7 Merge pull request #1033 from vieux/fix_static_go1.4 
fix static compile with go 1.4
 2015-07-06 17:20:34 -07:00
Jeffrey Morgan
3667faf678 Merge branch 'master' of github.com:docker/toolbox 2015-07-06 17:16:03 -07:00
Jeffrey Morgan
fbae993810 Rename to docker CLI 2015-07-06 17:15:46 -07:00
David Calavera
2905fe4806 Merge pull request #14414 from jfrazelle/fix-rpms 
fix rpms
 2015-07-06 17:12:38 -07:00
Victor Vieux
2d0d3c92b4 fix static compile with go 1.4 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2015-07-06 17:09:37 -07:00
Nathan LeClaire
eabe07294d Fix some docs issues 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-06 16:46:15 -07:00
Nathan LeClaire
0f36a14a67 Merge pull request #1388 from frastel/patch-1 
Added command for making the docker binary executable in the docs
 2015-07-06 16:20:59 -07:00
moxiegirl
6ffce0131c Merge pull request #14154 from chrismckinnel/master 
Fix a broken link to .dockerignore
 2015-07-06 15:48:25 -07:00
Fred Lifton
e8f10c898e Adds specifics for Marketplace users. 
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-07-06 15:48:11 -07: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
Andrea Luzzardi
db35563311 Merge pull request #1031 from vieux/more_info 
add name, http_proxy, https_proxy and no_proxy to docker info
 2015-07-06 15:38:04 -07:00
Victor Vieux
8048703206 Merge pull request #953 from ahmetalpbalkan/unsetenv 
Use os.Unsetenv in options_test
 2015-07-06 15:32:06 -07:00
Michael Crosby
691b2851f7 Always attach STDIN if -i,--interactive is specified 
There is no reason to error out or not do what the user expects when -i
is specified on the cli.  We should always attach to the stdin of the
container in this situation.

Closes #14390

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-07-06 15:24:23 -07:00
Nathan LeClaire
cac4795d81 Merge pull request #1404 from danielsoro/patch-1 
docs: VMware environment vars / CLI options are mismatched
 2015-07-06 15:24:19 -07:00
Victor Vieux
e10b4555e7 add name, http_proxy, https_proxy and no_proxy to docker info 
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-06 15:17:48 -07:00
Victor Vieux
a54763ca55 fix image matching in push 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-07-06 14:57:44 -07:00
Sebastiaan van Stijn
4f69609ac2 Merge pull request #14411 from duglin/Issue14407 
Add some missing events to the API docs
 2015-07-06 23:29:56 +02:00
Victor Vieux
7a1734cae5 Merge pull request #1026 from abronan/fix_zookeeper_discovery 
update libkv godeps, fix zookeeper discovery list
 2015-07-06 14:15:56 -07:00
root
e7fb38410d RunOOM test should check to see if Oom Control is enabled 
closes #13766
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-06 21:15:55 +00:00
Jessica Frazelle
76a853de6e fix rpms 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-07-06 14:14:26 -07:00
Evan Hazlett
9d5dff8966 Merge pull request #1470 from nathanleclaire/b2d_hostname 
Set boot2docker hostname properly
 2015-07-06 16:19:04 -04:00
Nathan LeClaire
fd35c7df48 Set boot2docker hostname properly 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-06 13:11:07 -07:00
Vincent Demeester
6e4c6da819 Fix integration tests with testRequires(c, Network) 
It seems http://hub.docker.com is not accessible anymore, so switching
to https://hub.docker.com for testRequires(c, Network).

Adds a Timeout check on the TestRequirement to *panic* if there is a
timeout (fail fast).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-06 22:08:35 +02:00