Ahmet Alp Balkan
b754dfbfae
add C# docker client library link
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: cde53c51b575d0cdeb01fc3428877ab63165e8b0
Component: engine
2014-09-07 23:29:04 -07:00
Sven Dowideit
88d96e44fd
Merge pull request #7908 from nhsiehgit/issue363imgfix
...
added a css fix for the image bug issue
Upstream-commit: 4b3ee6c10642a5813b89d5b2e32c01dcede4c871
Component: engine
2014-09-08 11:10:03 +10:00
Nathan Hsieh
112f364609
added a css fix for the image bug issue
...
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
(github: nhsiehgit)
Upstream-commit: e44bdd612b93e806a1cfcba8c156860de5ef3791
Component: engine
2014-09-05 10:48:51 -07:00
Tianon Gravi
7c69a280eb
Merge pull request #7893 from tianon/travis-run-tests
...
Update Travis to also run the test suite
Upstream-commit: 38186084b3ade82049d03f4f83640a0d47c3040c
Component: engine
2014-09-05 09:19:38 -06:00
Sven Dowideit
1218d181fb
Use a local copy of jquery so that the docs work in China, and offline too.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 5fe94f0d914a20846142a365655dad7a99527b44
Component: engine
2014-09-05 11:48:34 +10:00
Victor Vieux
7eea51ea83
Merge pull request #7883 from LK4D4/fix_build_race
...
Fix race between dispatchers.run and toDisk
Upstream-commit: b0cff06c9743f1f4edeea38c13a8b657eef446e4
Component: engine
2014-09-04 17:32:46 -07:00
Sven Dowideit
da01801fe3
Merge pull request #7890 from fredlf/docs-cherry-pick-update-process
...
Changes to Sven's cherry pick process
Upstream-commit: 03fdc7d2c183948d2415ba1fc19b8678b59d9e7a
Component: engine
2014-09-05 09:58:18 +10:00
Tianon Gravi
341cb3161f
Update Travis to also run the test suite
...
Signed-off-by: Andrew Page <admwiggin@gmail.com >
Upstream-commit: 068b9ac4d2f236905bb9deb024189082876a3c3f
Component: engine
2014-09-04 17:20:02 -06:00
Tibor Vass
0f1377200f
Merge pull request #7878 from LK4D4/fix_net_for_none
...
Don't initialize network for 'none' mode
Upstream-commit: 1a2a4f61abb3a5b40de70b10f39c90d7593679a5
Component: engine
2014-09-04 15:30:03 -07:00
Tianon Gravi
d4f0012956
Merge pull request #7763 from jamtur01/kate
...
Add syntax highlighting file for KDE's "Kate" editor
Upstream-commit: d3b5bf5d24026b1c60aaa77d25460b23c7564f6a
Component: engine
2014-09-04 15:28:11 -06:00
Fred Lifton
d94ba95b52
Changes to Sven's cherry pick process
...
Added content and revised after walk-through
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: b23daef3ec9fdecc6b7bcc1e3a657eccf1f5f399
Component: engine
2014-09-04 13:32:16 -07:00
Jan Keromnes
4d1ff5fd83
Update SSH demo to ubuntu 14.04
...
Signed-off-by: Jan Keromnes <janx@linux.com >
Upstream-commit: 98f57d1c392eab7df30fa3179c8e0f99a418e772
Component: engine
2014-09-04 20:27:41 +02:00
James Turnbull
dfcc6a8638
Merge pull request #7876 from nhsiehgit/typofix
...
small typo. wrapping cut code snippet
Upstream-commit: bc26aa7b50a5e9b01b274cffb89e3e0249d279f1
Component: engine
2014-09-04 12:37:07 -04:00
Alexandr Morozov
78de9287f3
Fix race between dispatchers.run and toDisk
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: f17410da5e4b5fa0e0dd2614f9b6e00dbcf66da6
Component: engine
2014-09-04 19:43:28 +04:00
Alexandr Morozov
dc74831ee4
Don't initialize network for 'none' mode
...
Fixes #7837
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: ba24820284a7a87642f2b668987c1627d6977ea2
Component: engine
2014-09-04 09:50:58 +04:00
Sven Dowideit
a87ee70b4f
Merge pull request #7828 from vieux/update_api_docs
...
Remote api docs for POST /containers/create were out of sync with runconfig/config.go
Upstream-commit: dbe112360718b6ddf6e74c8fcb6cf63204f2bbf2
Component: engine
2014-09-04 13:05:06 +10:00
Sven Dowideit
7dbfb968f4
Merge pull request #7858 from somaopensource/typo-fix
...
Dockerfile documentation typo and content fix
Upstream-commit: e1907bafb7b95a28e262c8f91524834627aaaf91
Component: engine
2014-09-04 13:03:04 +10:00
Michael Crosby
4d55ed3104
Merge pull request #7864 from unclejack/fix_panic_registry_session
...
registry/session: fix panic in GetRemoteImageLayer
Upstream-commit: d9fc61066d27b964ec337dc3db877ab3151b9280
Component: engine
2014-09-03 18:17:03 -07:00
Nathan Hsieh
534f9322ba
small typo. fixed broken code snippet
...
Docker-DCO-1.1-Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com > (github: nhsiehgit)
Upstream-commit: adc9a14db49f7e8ffd7cecb788bb9b560a7a3aae
Component: engine
2014-09-03 17:53:45 -07:00
Tibor Vass
7f4f710d0d
handle empty envvars for DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in daemon test framework
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: 39310448da1ed05d39f4400a56dd43e71591ae5b
Component: engine
2014-09-03 17:14:19 -07:00
Tibor Vass
7dcf943afc
fix race in daemon test framework
...
Signed-off-by: Tibor Vass <teabee89@gmail.com >
Upstream-commit: defe01daf87237e42a9275a0b286b0f71c60de25
Component: engine
2014-09-03 17:14:19 -07:00
Victor Vieux
713ee31e08
Merge pull request #7865 from cure/master
...
fix typos in error messages
Upstream-commit: affef9e785febbf9ecd832022113b21b5b7e10a3
Component: engine
2014-09-03 16:03:20 -07:00
Tibor Vass
daf4dd047c
Merge pull request #7818 from thomasleveil/completion-docker-build
...
Add --force-rm to docker build command completion
Upstream-commit: 782cde2c0f2960fe42298e3f4ca38d1b42c27e5f
Component: engine
2014-09-03 14:44:13 -07:00
James Turnbull
47b6756608
Merge pull request #7850 from fredlf/add_cherrypick_process
...
Add cherrypick process
Upstream-commit: a3326c346990e1fc797d8de0caace4314bf4ab05
Component: engine
2014-09-03 17:33:49 -04:00
Ward Vandewege
05579b5900
fix typos in error messages
...
Signed-off-by: Ward Vandewege <ward@jhvc.com > (github: cure)
Upstream-commit: a447894946ca2ac47bf1c46f78c4839c75fd740d
Component: engine
2014-09-03 13:12:10 -04:00
unclejack
e62472c6f3
registry/session: fix panic in GetRemoteImageLayer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 9c413e3e6f1c6bd6abada707c442862049d29743
Component: engine
2014-09-03 17:26:56 +03:00
Thomas LÉVEIL
6cc4adf9ba
Add --force-rm to docker build command completion
...
Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com >
Upstream-commit: 40f0bf75640f686b2160092db6fc874e672cfd16
Component: engine
2014-09-03 14:26:16 +02:00
Oh Jinkyun
2a4b59eccb
Dockerfile documentation typo and content fix
...
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
Upstream-commit: 476f1df36f6e8aa16a1e302efe8addec1fe191c9
Component: engine
2014-09-03 19:28:01 +09:00
Alexandr Morozov
0800bd7997
Merge pull request #7542 from unclejack/refactor_archive_buffering
...
Refactor archive buffering
Upstream-commit: 58dc474e6546e6ae9e4ebd06e9fd844442fea271
Component: engine
2014-09-03 12:39:14 +04:00
unclejack
fa012b5f22
archive: use pooled bufio readers and writers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 84d76e556bb96fbddcac20fb5dbce82223987bf8
Component: engine
2014-09-03 11:37:03 +03:00
unclejack
fca073bcf7
pkg/pool: add pools for bufio readers & writers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 2d2016b81b1f313cda2c8f145844b162352ba234
Component: engine
2014-09-03 11:36:39 +03:00
unclejack
dd97f278a0
pkg/ioutils: add ReaderErrWrapper to readers
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: bd130e72a06dc3e8de521ce365bf4933f36b2417
Component: engine
2014-09-03 11:36:21 +03:00
unclejack
dca3941db1
pkg/ioutils: add NewBufReaderWithDrainbufAndBuffer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: c93b9e81c03168ca69def94ba231d2ecc6672ce9
Component: engine
2014-09-03 11:36:21 +03:00
unclejack
0e15abc25d
pkg/ioutils: add WriteCloserWrapper
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 7b6f34057cee94bf22e4e58cd164731e6b0e8851
Component: engine
2014-09-03 11:36:21 +03:00
unclejack
e9ab736d16
move some io related utils to pkg/ioutils
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 76212635b594d4472dd8d5b2e071fac416addbe7
Component: engine
2014-09-03 11:36:21 +03:00
unclejack
5e4884eb6d
Merge pull request #7315 from vieux/add_pb
...
add progress bar to ADD
Upstream-commit: 2da75f7079256912c52621dcf39ec0b60f43a183
Component: engine
2014-09-03 11:00:31 +03:00
Tibor Vass
f1ec175d76
Merge pull request #7800 from djbk/master
...
Cleanup: Typo in job.go
Upstream-commit: 426fbee81001cadd1231903fb7219121616fe814
Component: engine
2014-09-02 17:47:18 -07:00
Fred Lifton
cda308f68d
Adding Docs Deploy process to Docs ReadMe
...
Additions and revisions to Sven's cherry-pick process doc.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 23cf3f74072290f2de0e57d87af3236d44e0b039
Component: engine
2014-09-02 17:44:36 -07:00
Byung Kang
475881edb2
Cleanup: Typo in job.go
...
Signed-off-by: Byung Kang <byungk91@gmail.com >
Upstream-commit: cc84ec3f6182a7af9ef881939305cf1ac13a383a
Component: engine
2014-09-02 19:37:14 -05:00
Victor Vieux
ba6779868a
Add a progress bar for ADD <url> <dst>
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4e40d09a2b13c1f7886783fa66b9fdfeb5369375
Component: engine
2014-09-03 00:17:08 +00:00
Jessie Frazelle
a74340a9e1
Merge pull request #7839 from LK4D4/embed_state_to_container
...
Use State as embedded to Container
Upstream-commit: f74b901da61fdd535e22f322b5cf1cc3f74e0935
Component: engine
2014-09-02 15:18:32 -07:00
Alexandr Morozov
13e3017817
Use State as embedded to Container
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: e0339d4b88989a31b72be02582eee72433d2f0ec
Component: engine
2014-09-03 00:01:11 +04:00
unclejack
c953d01896
Merge pull request #7191 from tiborvass/test-daemon
...
Add Daemon restart test along with Daemon utils
Upstream-commit: 6db078dea79633973b77ca5afad924e10340b39f
Component: engine
2014-09-02 22:40:23 +03:00
Victor Vieux
f5b1567d44
Merge pull request #7842 from unclejack/build_delete_context
...
clean up context on build completion & add test
Upstream-commit: 6eef7de396f3da6fbe2fab82fd29894bc9d73719
Component: engine
2014-09-02 12:19:47 -07:00
Tibor Vass
d93084e649
Merge pull request #7765 from erikh/test_unit_testflags
...
hack/make: fix test-unit target to propogate TESTFLAGS properly
Upstream-commit: ca24e91408181d1cbbae04fc18edce2fe61f02aa
Component: engine
2014-09-02 12:18:40 -07:00
Tibor Vass
e9f9032556
Add TestDaemonRestartWithRunningContainersPorts
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: a9971a89ccb0bd8688e7a8ab8058dcbb66d61687
Component: engine
2014-09-02 12:13:21 -07:00
Erik Hollensbe
4444b40c84
hack/make: fix test-unit target to propogate TESTFLAGS properly
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 9a2d4e92730a576a05e40f7575a6c90512896e87
Component: engine
2014-09-02 12:10:47 -07:00
Tibor Vass
c02ebae1f7
Add Daemon test utils
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 054b921a2c140f9b8250f6c7e12dec9fba23ce0f
Component: engine
2014-09-02 10:58:36 -07:00
unclejack
9046d6de2c
clean up context on build completion & add test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 18587469789594f7ca26fc942c6d23b971a14dd3
Component: engine
2014-09-02 17:35:25 +03:00
Michael Crosby
ef9df7ad17
Add more error info to TestDockerRunEchoStdoutWithMemoryLimit
...
This test fails on my CI server often so we need more info when it does
happen with this test.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: c0a5ec75c5a8f2d3ccb2f0c1a90f30bb20cdd60b
Component: engine
2014-09-01 17:09:52 -07:00