2f18e59567
Test case for network mode chain container -> container -> host
...
Issue #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ce69dafe4d0424ddb5df53d9aee7728f0734cce7
Component: engine
2015-04-07 15:20:42 -07:00
9f318dd3e8
Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44
...
Fix #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 2f853b94931057d8ebcd6e21f7656d3a04e2acf4
Component: engine
2015-04-07 15:10:44 -07:00
f1afc0b3d1
Merge pull request #12154 from moxiegirl/carry-pr-11409
...
Carrying 11409 for a contributor
Upstream-commit: 8b7193057038d880be04d64e3470cdde30eb9218
Component: engine
2015-04-07 15:00:26 -07:00
b1b0f97441
Merge pull request #12155 from kostickm/12146-fix-fail-msg-TestRunDeviceDirectory
...
Fixing fail message in TestRunDeviceDirectory
Upstream-commit: d1423d28b59dcf1bb3e634033cdccb39afe366af
Component: engine
2015-04-07 14:55:30 -07:00
c4ee31b99c
Merge pull request #12156 from moxiegirl/pr-12008-carry
...
Carry PR 12008 for contributor
Upstream-commit: 65ca20e6f1ee74c3b6b786873d5b7b213d21a0d1
Component: engine
2015-04-07 14:54:02 -07:00
27dad5da53
Carry PR 12008 for contributor
...
Closes #8040
Remove a tic for the hawk
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 87e70b6831386775a0d6c6b952c947865f1d053b
Component: engine
2015-04-07 14:09:53 -07:00
8dfe9e8a9b
Merge pull request #11947 from TonnyXu/master
...
Updated the explanation of ONBUILD in best-practices doc
Upstream-commit: 9dd23be563be63b8dc3cf0ffda696cdf558f82fd
Component: engine
2015-04-07 16:53:43 -04:00
c9ca56fbcb
Merge pull request #12089 from nerdalert/doc-fix-netw-nerdalert
...
Replaced level with layer for OSI model references
Upstream-commit: 4d4f201a4d453501dbe1fc049abad98c4933b237
Component: engine
2015-04-07 13:29:40 -07:00
ca7b99332a
Merge pull request #11909 from runcom/11908-refactor-utils-utils-daemon
...
Refactor utils/utils_daemon
Upstream-commit: ebd7df3bbeb9486d13119178810a1ddabfd6d04d
Component: engine
2015-04-07 13:24:24 -07:00
5ce261de6c
Carrying 11409 for a client
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: fdfc36db416663e3c8434c031e01bd6211ce5d8b
Component: engine
2015-04-07 13:20:17 -07:00
15349ce580
Fixing fail message in TestRunDeviceDirectory
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: 05dcf261992ee2fe639977a9e063051cadaf1c50
Component: engine
2015-04-07 13:14:47 -07:00
37758aba7d
Merge pull request #12033 from rhvgoyal/devmapper-cleanup
...
Devmapper Graph Driver Misc cleanup
Upstream-commit: 86d66d62737aa090b4a703ce0bfe3df0f9669a6b
Component: engine
2015-04-07 15:49:32 -04:00
b525e35a97
Merge pull request #12129 from duglin/RemoveTable5
...
Remove engine.Table from more daemon side stuff
Upstream-commit: e011119a497b6c6c18a6d1f048b1e69e2ab2eb7a
Component: engine
2015-04-07 12:53:55 -04:00
3b55a8d20b
Merge pull request #12136 from YanFeng-Adam/typo
...
Fix 2 typos in /doc/sources/reference/run.md
Upstream-commit: 531d2b3b80ee92c7cda93e388ca0a747935c87eb
Component: engine
2015-04-07 09:21:01 -07:00
cb57509d97
Fix 2 typos in /doc/sources/reference/run.md
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
Upstream-commit: 805f34bb5b6f639b3eb361672af2cbc7437e2ce9
Component: engine
2015-04-07 14:15:05 -04:00
4b42a60c0f
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 >
Upstream-commit: 7165089f34a1ff6d1c350dcd46bdcef15667cab1
Component: engine
2015-04-06 22:23:40 -04:00
1cd462a82c
Merge pull request #12127 from ahmetalpbalkan/win-cli/termsize-fix
...
Swap width/height in GetWinsize and monitorTtySize
Upstream-commit: 9ede3f9fc13ac9c27282afdb44590b55f955cc9c
Component: engine
2015-04-06 16:54:29 -07:00
d5f5705973
Remove engine.Table from more daemon side stuff
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 650bc2ffe545f874adeb3c1d6f54e9158a7d647e
Component: engine
2015-04-06 15:06:02 -07:00
02aa86f034
Swap width/height in GetWinsize and monitorTtySize
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 6e44246fed43341938a41c6db9b115e1e64d332a
Component: engine
2015-04-06 14:31:42 -07:00
d1f6bdefa9
Merge pull request #12125 from LK4D4/fix_events_streaming_test
...
Fix events streaming test
Upstream-commit: 3588c5fbc7ec00b3de6761d1121186b0d39afef1
Component: engine
2015-04-06 17:12:48 -04:00
5c284b836c
Decrease timeouts in TestEventsStreaming
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: e45bf8d2e9b43a4f5c5ed844b333733f95ccbafb
Component: engine
2015-04-06 13:40:56 -07:00
b38d23a637
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 >
Upstream-commit: 5fa3a6f2482521d5731c43e076926f2f5318aa94
Component: engine
2015-04-06 13:39:02 -07:00
d69d67a964
Merge pull request #12070 from duglin/RemoveTableCLI
...
Last step in removing engine.Table from api/client/*
Upstream-commit: dec48d6708aa9fc7732d2451d9913e612fc989be
Component: engine
2015-04-06 16:33:29 -04:00
cffe4fa24a
Merge pull request #11686 from willhf/9340_test
...
Add test for net=container and links
Upstream-commit: 8a50746b5d7783b734c6096b4e2ef444e901397e
Component: engine
2015-04-06 13:21:01 -07:00
aa50fab356
Merge pull request #12121 from tiborvass/copy-not-deprecated
...
Revert "Since `COPY` has been deprecated in the recent release of Docker...
Upstream-commit: 488a721dc904afd85229d027da9e30c1369ee29f
Component: engine
2015-04-06 13:18:55 -07:00
d62565ffca
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 3148063af16e5c14ea543f615d136f477a4e9537.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: d2992c78dc1f71b0844b3c17d5ea9be8fff8b15e
Component: engine
2015-04-06 15:34:10 -04:00
dc2be073c9
Merge pull request #12064 from brendandixon/win-cli/rawfix
...
Windows console fixes
Upstream-commit: 37a16580b1d62161abb3ef9288903f5883a0173e
Component: engine
2015-04-06 18:45:08 +00:00
136a897ab2
Merge pull request #11993 from crunchywelch/master
...
add centos to supported distros
Upstream-commit: 9cad920c08664bae2b69d71f5588d9e797f0e6e8
Component: engine
2015-04-06 11:44:40 -07:00
a0e29b0a30
Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update
...
Updated the dockerfile best practice section on ADD and COPY
Upstream-commit: 2c44556ff9d94ddeca09349c8c4669a47cfe22fb
Component: engine
2015-04-06 11:43:50 -07:00
84e28d150d
Merge pull request #12055 from l0kix2/patch-1
...
Improved "start a container" section 1.16 & 1.17 API docs
Upstream-commit: ce18734c2cffebe112d06dca9117150ceaa08e15
Component: engine
2015-04-06 11:41:38 -07:00
ec38205886
Merge pull request #11324 from sunyuan3/TestDaemonwithwrongkey
...
add TestDaemonwithwrongkey test case
Upstream-commit: f5657249a0120e48975fbe986dde78b7975dac17
Component: engine
2015-04-06 11:35:05 -07:00
92a7113498
Merge pull request #12090 from runcom/12079-events-streaming-tests
...
Test events streaming
Upstream-commit: a0fc0343b7e8ac1a363ab856b87d6a9524d425cf
Component: engine
2015-04-06 11:23:47 -07:00
142a5765d0
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
2015-04-06 11:11:31 -07:00
ef8d6cbdf1
Last step in removing engine.Tabel from api/client/*
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 065648a8324a0df5d5d05b3df223e6b058260425
Component: engine
2015-04-06 10:55:53 -07:00
4642e7f120
Merge pull request #11293 from shishir-a412ed/docker_load_clobber_image_name
...
Fix for Issue 11285: warning message displayed when updating an existing image
Upstream-commit: 281b8f67e145f58a3b364ce469ae71e216961e8c
Component: engine
2015-04-06 13:04:49 -04:00
ea1fc2ed3e
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 >
Upstream-commit: 3148063af16e5c14ea543f615d136f477a4e9537
Component: engine
2015-04-06 10:04:42 -07:00
a65903a8b7
Merge pull request #12100 from draghuram/docker_update
...
Add the missing option to the wget command for updating Docker.
Upstream-commit: 3e077bb3f73c4effa3135851811b23f1292ebe24
Component: engine
2015-04-06 10:03:23 -07:00
286897aa48
Test events streaming, fixes #12079
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: d1c4439b5aa9bfc6767372b64e3f3a1fdb7f7b65
Component: engine
2015-04-06 19:00:17 +02:00
42264ee36e
Merge pull request #12020 from chenhanxiao/docker-import-commit
...
docs: keep the style of docker-commit consistent with docker-import
Upstream-commit: 96c3141fa5c81e3d672215d5bfcfb7534e96af2f
Component: engine
2015-04-06 09:47:47 -07:00
45fb864556
Merge pull request #12112 from kostickm/12042-fix-logDone-format
...
Fixes logDone format
Upstream-commit: d3fa57e051cced38cdd65034077fe5b080999da7
Component: engine
2015-04-06 12:34:38 -04:00
42e6264f16
Merge pull request #10275 from Snorch/master
...
docker-tests: mount hierarchies and make symlinks for subsystems
Upstream-commit: 8b4c3a111d025bdb7c4f78eaa233a7c74295ad67
Component: engine
2015-04-06 10:32:04 -06:00
07de27cc12
Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754
...
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
Upstream-commit: d489b91aa94a6e15d7d1daa953468cac9866f218
Component: engine
2015-04-06 09:23:53 -07:00
cedce1294d
Merge pull request #11554 from Sirupsen/logrus-fields
...
logging: use logrus fields
Upstream-commit: ac93a13e2745559887b5c5efd3cff1ed904f5092
Component: engine
2015-04-06 09:00:18 -07:00
f18fe75c72
Closes #12042 - fix logDone format
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: d6ada45f45c6743ec0ab3f049a0742278634a22a
Component: engine
2015-04-06 08:54:35 -07:00
65d39050f9
Merge pull request #12102 from x1022as/typo
...
fix typo
Upstream-commit: 90be2a66a8d5a179c976da5525a314fe5cd6cb59
Component: engine
2015-04-06 08:46:41 -07:00
a714c4cf33
Merge pull request #12107 from cpuguy83/remove_striptrailingchars
...
Remove `stripTrailingCharacters` from tests
Upstream-commit: b9d2ede4d4dc67b97abd0254a9e431aa9c89b932
Component: engine
2015-04-06 08:46:08 -07:00
35ff4787b1
Merge pull request #12110 from leoh0/fix-typo
...
Minor spelling fix
Upstream-commit: 716576b0ccb9c35e88572cfe7f413648d2337976
Component: engine
2015-04-06 08:43:18 -07:00
9d932cfc62
Minor spelling fix
...
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com >
Upstream-commit: 7986c37996aa7321eaf3e86dd844a3e5c36c8c68
Component: engine
2015-04-06 23:27:53 +09:00
ab9a366f0e
Remove stripTrailingCharacters from tests
...
This was just an alias to `strings.TrimSpace`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 475c65319b4663d630711519e18d0b134c42c7f1
Component: engine
2015-04-06 09:21:18 -04:00
9d18deed31
Applying: Fix for Issue 11285: warning message displayed when updating an existing image
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 7d0053d554c453f0ec426bde2899dd55a265f09a
Component: engine
2015-04-06 09:05:03 -04:00
