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

14510 Commits

Author SHA1 Message Date
Yuan Sun cc30282e94 duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-04-08 13:33:05 +08:00
Michael Crosby 06433cf812 Merge pull request #12161 from LK4D4/update_libcontainer 
Update libcontainer
 2015-04-07 16:18:33 -07:00
Jessie Frazelle d08db9a059 Merge pull request #12160 from mrunalp/remove_unused 
Removes unused function.
 2015-04-07 16:05:49 -07:00
Alexander Morozov ce69dafe4d Test case for network mode chain container -> container -> host 
Issue #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 15:20:42 -07:00
Mrunal Patel 195bebd3a7 Removes unused function. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-04-07 18:15:28 -04:00
Tibor Vass dccda72a41 Merge pull request #12120 from LK4D4/split_attach 
Remove engine usage from attach
 2015-04-07 18:13:35 -04:00
Alexander Morozov 2f853b9493 Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44 
Fix #12130

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 15:10:44 -07:00
moxiegirl 8b71930570 Merge pull request #12154 from moxiegirl/carry-pr-11409 
Carrying 11409 for a contributor
 2015-04-07 15:00:26 -07:00
Alexander Morozov d1423d28b5 Merge pull request #12155 from kostickm/12146-fix-fail-msg-TestRunDeviceDirectory 
Fixing fail message in TestRunDeviceDirectory
 2015-04-07 14:55:30 -07:00
moxiegirl 65ca20e6f1 Merge pull request #12156 from moxiegirl/pr-12008-carry 
Carry PR 12008 for contributor
 2015-04-07 14:54:02 -07:00
Alexander Morozov c44f513248 Remove engine usage from attach 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-04-07 14:23:09 -07:00
Mary Anthony 87e70b6831 Carry PR 12008 for contributor 
Closes #8040
Remove a tic for the hawk

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-07 14:09:53 -07:00
Tibor Vass 9dd23be563 Merge pull request #11947 from TonnyXu/master 
Updated the explanation of ONBUILD in best-practices doc
 2015-04-07 16:53:43 -04:00
moxiegirl 4d4f201a4d Merge pull request #12089 from nerdalert/doc-fix-netw-nerdalert 
Replaced level with layer for OSI model references
 2015-04-07 13:29:40 -07:00
Jessie Frazelle ebd7df3bbe Merge pull request #11909 from runcom/11908-refactor-utils-utils-daemon 
Refactor utils/utils_daemon
 2015-04-07 13:24:24 -07:00
Mary Anthony fdfc36db41 Carrying 11409 for a client 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-04-07 13:20:17 -07:00
Megan Kostick 05dcf26199 Fixing fail message in TestRunDeviceDirectory 
Signed-off-by: Megan Kostick <mkostick@us.ibm.com>
 2015-04-07 13:14:47 -07:00
Vincent Batts 86d66d6273 Merge pull request #12033 from rhvgoyal/devmapper-cleanup 
Devmapper Graph Driver Misc cleanup
 2015-04-07 15:49:32 -04:00
Phil Estes e011119a49 Merge pull request #12129 from duglin/RemoveTable5 
Remove engine.Table from more daemon side stuff
 2015-04-07 12:53:55 -04:00
moxiegirl 531d2b3b80 Merge pull request #12136 from YanFeng-Adam/typo 
Fix 2 typos in /doc/sources/reference/run.md
 2015-04-07 09:21:01 -07:00
Yan Feng 805f34bb5b Fix 2 typos in /doc/sources/reference/run.md 
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
 2015-04-07 14:15:05 -04:00
Brent Salisbury 7165089f34 Replaced level with layer for OSI model references 
- ty to @moxiegirl for the info workflow for patching images.

-link to the v6 svg (grey L2 switch in the top /level/layer/)
http://docs.master.dockerproject.com/article-img/ipv6_switched_network_example.svg

Signed-off-by: Brent Salisbury <brent.salisbury@docker.com>
 2015-04-06 22:23:40 -04:00
Jessie Frazelle 9ede3f9fc1 Merge pull request #12127 from ahmetalpbalkan/win-cli/termsize-fix 
Swap width/height in GetWinsize and monitorTtySize
 2015-04-06 16:54:29 -07:00
Doug Davis 650bc2ffe5 Remove engine.Table from more daemon side stuff 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-06 15:06:02 -07:00
Ahmet Alp Balkan 6e44246fed Swap width/height in GetWinsize and monitorTtySize 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-04-06 14:31:42 -07:00
Phil Estes 3588c5fbc7 Merge pull request #12125 from LK4D4/fix_events_streaming_test 
Fix events streaming test
 2015-04-06 17:12:48 -04:00
Alexandr Morozov e45bf8d2e9 Decrease timeouts in TestEventsStreaming 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2015-04-06 13:40:56 -07:00
Alexandr Morozov 5fa3a6f248 Pass right timestamp instead of crap from string(int64) 
Problem is that --since can consume anything not near looking as
timestamp.

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2015-04-06 13:39:02 -07:00
Phil Estes dec48d6708 Merge pull request #12070 from duglin/RemoveTableCLI 
Last step in removing engine.Table from api/client/*
 2015-04-06 16:33:29 -04:00
Arnaud Porterie 8a50746b5d Merge pull request #11686 from willhf/9340_test 
Add test for net=container and links
 2015-04-06 13:21:01 -07:00
Michael Crosby 488a721dc9 Merge pull request #12121 from tiborvass/copy-not-deprecated 
Revert "Since `COPY` has been deprecated in the recent release of Docker...
 2015-04-06 13:18:55 -07:00
Tibor Vass d2992c78dc Revert "Since `COPY` has been deprecated in the recent release of Docker I updated the best practices section to inform users that `ADD` is the way forward and to not use `COPY`." 
COPY was not deprecated.

This reverts commit 3148063af1.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-04-06 15:34:10 -04:00
Jessie Frazelle 37a16580b1 Merge pull request #12064 from brendandixon/win-cli/rawfix 
Windows console fixes
 2015-04-06 18:45:08 +00:00
moxiegirl 9cad920c08 Merge pull request #11993 from crunchywelch/master 
add centos to supported distros
 2015-04-06 11:44:40 -07:00
moxiegirl 2c44556ff9 Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update 
Updated the dockerfile best practice section on ADD and COPY
 2015-04-06 11:43:50 -07:00
moxiegirl ce18734c2c Merge pull request #12055 from l0kix2/patch-1 
Improved "start a container" section 1.16 & 1.17 API docs
 2015-04-06 11:41:38 -07:00
Alexander Morozov f5657249a0 Merge pull request #11324 from sunyuan3/TestDaemonwithwrongkey 
add TestDaemonwithwrongkey test case
 2015-04-06 11:35:05 -07:00
Alexander Morozov a0fc0343b7 Merge pull request #12090 from runcom/12079-events-streaming-tests 
Test events streaming
 2015-04-06 11:23:47 -07:00
Arnaud Porterie ed8d402851 Merge pull request #11978 from x1022as/info-show-loggingdriver 
docker info show logging driver info
 2015-04-06 11:11:31 -07:00
Doug Davis 065648a832 Last step in removing engine.Tabel from api/client/* 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-06 10:55:53 -07:00
Tibor Vass 281b8f67e1 Merge pull request #11293 from shishir-a412ed/docker_load_clobber_image_name 
Fix for Issue 11285: warning message displayed when updating an existing image
 2015-04-06 13:04:49 -04:00
malnick 3148063af1 Since `COPY` has been deprecated in the recent release of Docker I updated the best practices section to inform users that `ADD` is the way forward and to not use `COPY`. 
Signed-off-by: malnick <malnick@gmail.com>
 2015-04-06 10:04:42 -07:00
moxiegirl 3e077bb3f7 Merge pull request #12100 from draghuram/docker_update 
Add the missing option to the wget command for updating Docker.
 2015-04-06 10:03:23 -07:00
Antonio Murdaca d1c4439b5a Test events streaming, fixes #12079 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-04-06 19:00:17 +02:00
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