docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,449 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

14449 Commits

Author SHA1 Message Date
moxiegirl 96c3141fa5 Merge pull request #12020 from chenhanxiao/docker-import-commit 
docs: keep the style of docker-commit consistent with docker-import
 2015-04-06 09:47:47 -07:00
Brian Goff d3fa57e051 Merge pull request #12112 from kostickm/12042-fix-logDone-format 
Fixes logDone format
 2015-04-06 12:34:38 -04:00
Tianon Gravi 8b4c3a111d Merge pull request #10275 from Snorch/master 
docker-tests: mount hierarchies and make symlinks for subsystems
 2015-04-06 10:32:04 -06:00
moxiegirl d489b91aa9 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754 
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
 2015-04-06 09:23:53 -07:00
Arnaud Porterie ac93a13e27 Merge pull request #11554 from Sirupsen/logrus-fields 
logging: use logrus fields
 2015-04-06 09:00:18 -07:00
Megan Kostick d6ada45f45 Closes #12042 - fix logDone format 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-06 08:54:35 -07:00
Arnaud Porterie 90be2a66a8 Merge pull request #12102 from x1022as/typo 
fix typo
 2015-04-06 08:46:41 -07:00
Arnaud Porterie b9d2ede4d4 Merge pull request #12107 from cpuguy83/remove_striptrailingchars 
Remove `stripTrailingCharacters` from tests
 2015-04-06 08:46:08 -07:00
Arnaud Porterie 716576b0cc Merge pull request #12110 from leoh0/fix-typo 
Minor spelling fix
 2015-04-06 08:43:18 -07:00
Eohyung Lee 7986c37996 Minor spelling fix 
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com>
 2015-04-06 23:27:53 +09:00
Brian Goff 475c65319b Remove `stripTrailingCharacters` from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-04-06 09:21:18 -04:00
Deng Guangxing 71de711189 fix typo in cli.md 
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
 2015-04-06 16:11:40 +08:00
Simei He 5057d7da13 fix the space thing. 
Signed-off-by: Simei He <hesimei@zju.edu.cn>
 2015-04-06 09:00:59 +08:00
Doug Davis 58390b6087 Merge pull request #12075 from eljojo/remove_stupid 
Remove "stupid" wording
 2015-04-04 12:37:38 -04:00
José Tomás Albornoz 4cf5a1c2aa Remove "stupid" wording 
Signed-off-by: José Tomás Albornoz <jojo@eljojo.net>
 2015-04-04 15:26:45 +02:00
Doug Davis ca8d196d13 Merge pull request #12074 from guoxiuyan/Fix_typo 
Fix a minor typo
 2015-04-04 07:34:35 -04:00
guoxiuyan ffcc4a1e52 Fix a minor typo 
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com>
 2015-04-04 15:36:35 +08:00
Michael Crosby 2a79d54f4c Merge pull request #12063 from icecrime/update_maintainers 
Several updates to MAINTAINERS file
 2015-04-03 17:20:20 -07:00
Arnaud Porterie a45375f1f9 Merge pull request #12069 from whoshuu/notice-link 
Make NOTICE in the README into a link
 2015-04-03 17:08:53 -07:00
Arnaud Porterie 886026f99e Add thaJeztah 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-03 16:37:36 -07:00
Huu Nguyen d94e186442 Make NOTICE in the README into a link 
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
 2015-04-03 16:36:49 -07:00
Tianon Gravi 6a99c2032e Merge pull request #12065 from proppy/patch-14 
test-unit: fix TESTFLAGS doc
 2015-04-03 16:26:11 -06:00
Simon Eskildsen e1ca439828 daemon: convert version log statement to fields 
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
 2015-04-03 18:22:17 -04:00
Johan Euphrosine 5846914f91 test-unit: fix TESTFLAGS doc 
Signed-off-by: Johan Euphrosine <proppy@google.com>
 2015-04-03 15:05:14 -07:00
Arnaud Porterie 58f07c9d8a Rename status labels 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-03 14:33:16 -07:00
Arnaud Porterie 80f3085651 Sort maintainers alphabetically 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-03 14:33:16 -07:00
Arnaud Porterie 370cef012e Move docs approval section 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-03 14:33:16 -07:00
Jessie Frazelle b2fbd9e632 Merge pull request #12060 from duglin/RemoveTable3 
Remove engine.Table from docker search and fix missing field
 2015-04-03 21:29:36 +00:00
Jessie Frazelle 9cdad8a26b Merge pull request #11886 from jamiehannaford/pkg-mnt-docs 
Document exported functions and consts in pkg/mount
 2015-04-03 21:28:11 +00:00
Alexander Morozov 5c83dfe670 Merge pull request #11994 from unclejack/jsonfilelog_allocations 
daemon/logger/jsonfilelog: avoid some allocations
 2015-04-03 13:58:13 -07:00
Jessie Frazelle 4d571257ed Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update 
docs: Add new windows installation tutorials
 2015-04-03 20:39:21 +00:00
moxiegirl fb1e10284b Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter 
docs: fix bullet list and missing label filter
 2015-04-03 12:33:22 -07:00
moxiegirl a6c04f33e1 Merge pull request #12003 from sleinen/patch-1 
Make explanation consistent with command
 2015-04-03 12:19:37 -07:00
moxiegirl 6d5a0ac11e Merge pull request #12057 from icecrime/11925_carry 
Specify running `boot2docker ip` on host
 2015-04-03 12:11:53 -07:00
Jessie Frazelle 409ed98c3f Merge pull request #12048 from tianon/auto-btrfs_noversion 
Change the btrfs_noversion check to be automatic
 2015-04-03 19:00:57 +00:00
Jessie Frazelle 3985dc299a Merge pull request #12054 from eluck/master 
Update userguide/dockervolumes - fixes issue #12052
 2015-04-03 18:58:52 +00:00
Jessie Frazelle 3683498d6f Merge pull request #12037 from twhiteman/master 
integration-cli: in TestPsListContainersSize, check for no containers
 2015-04-03 18:52:26 +00:00
Jessie Frazelle 55da2e5987 Merge pull request #12059 from whoshuu/readme 
Clean up formatting in the README
 2015-04-03 18:49:26 +00:00
Ahmet Alp Balkan 2b320a2309 docs: Add new windows installation tutorials 
Updated Windows installation documentation with newest
screencasts and Chocolatey instructions to install windows
client CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-03 11:33:34 -07:00
Doug Davis 67b4cce0f6 Remove engine.Table from docker search and fix missing field 
registry/SearchResults was missing the "is_automated" field.
I added it back in.

Pull this 'table' removal one from the others because it fixed
a bug too

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-03 11:27:30 -07:00
Michael Crosby e64f6baf11 Merge pull request #12010 from ibuildthecloud/small 
Small changes from #11967 for review comments
 2015-04-03 11:27:06 -07:00
Jessie Frazelle b3e9c274dd Merge pull request #11981 from unclejack/fix_profiler 
api/server: fix profiler HTTP serving
 2015-04-03 18:25:12 +00:00
Michael Crosby 326a5545d4 Merge pull request #12058 from duglin/RemoveTable2 
Remove engine.Table from docker history and docker rmi
 2015-04-03 10:57:52 -07:00
moxiegirl 12e7787540 Merge pull request #12017 from moxiegirl/distribution-man-pages 
Updating with man pages for distribution
 2015-04-03 09:55:08 -07:00
Huu Nguyen bfddad18ce Clean up formatting in the README 
Signed-off-by: Huu Nguyen <whoshuu@gmail.com>
 2015-04-03 09:50:35 -07:00
Arnaud Porterie 61933395eb Merge pull request #11860 from maximkulkin/11575-dockerize-image-tool 
Add tool to conver disk image into Docker image
 2015-04-03 09:32:11 -07:00
Arnaud Porterie c8ca904f15 Merge pull request #11881 from jrjang/master 
mkimage-arch: set default C.UTF-8 locale
 2015-04-03 09:28:11 -07:00
Arnaud Porterie bcbdf77ddb Specify running `boot2docker ip` on host 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-04-03 08:53:44 -07:00
Alexander Morozov 03525d5fc6 Merge pull request #11956 from coolljt0725/add_memcg_swap_cgroup_enabled_to_check_config 
add MEMCG_SWAP_ENABLED to check-config.sh
 2015-04-03 08:50:54 -07:00
Doug Davis 2c5da7d1ac Merge pull request #12018 from sunyuan3/search 
If docker search with --starts=${negative number}, it would show the war...
 2015-04-03 11:38:38 -04:00