5886dc651d
Merge branch 'adding_official-repo-guidelines' of https://github.com/fredlf/docker into adding_official-repo-guidelines
...
Conflicts:
docs/sources/docker-hub/official_repos.md
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: dd5657ffd1a60fe89d57f585454a91823b2da516
Component: engine
2014-09-10 14:30:19 -07:00
1fec550074
Fixes a couple small typos
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: a2ba4d56eb134f95eba790bb484e0c8bd77d1fc4
Component: engine
2014-09-10 14:26:03 -07:00
80e042431f
Merge pull request #1 from yosifkit/adding_official-repo-guidelines
...
Fix formatting, change to markdown block for long
Upstream-commit: 0164cf0e9cd4d4262c477518b0968f4264975759
Component: engine
2014-09-10 14:25:36 -07:00
844e4f396f
Fix formatting, change to markdown block for long
...
Signed-off-by: Joe Ferguson <joe@infosiftr.com >
Upstream-commit: bcb9378c5b91f8fd7bc99d1ad0904f5cba6ee613
Component: engine
2014-09-10 14:46:11 -06:00
cd84ba9ec9
More format wrestling.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 5b6c4051d58bf535eded3ae557a0996937e96045
Component: engine
2014-09-08 17:32:29 -07:00
90ad492641
More format fixes.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 5fea2b5be32165364294e22bc24aee3fa34cf756
Component: engine
2014-09-08 16:30:39 -07:00
ac2e0701e0
Format and typo fixes
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: a899b8a63ec83bc5fa70ff8663db5ae3671d56a9
Component: engine
2014-09-08 12:36:52 -07:00
4f240b14ac
Revisions based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: eb8d0c1ccffe612f2c017871d5b8b39320256c6f
Component: engine
2014-09-08 11:43:09 -07:00
cb4c9836e4
Adding first draft of Official Repo Guidelines
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 58e89878374d12c916fa9e2b5436f5e042bc6978
Component: engine
2014-09-04 18:09:00 -07:00
ba6b156d87
Merge pull request #7873 from jankeromnes/patch-1
...
Update SSH demo to ubuntu 14.04
Upstream-commit: f7c0ac9a8bc3602b9156a3ac8ae0b9bc0671d78d
Component: engine
2014-09-04 15:45:55 -04:00
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
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
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
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
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
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
da5e387034
Merge pull request #7875 from tiborvass/fix-integration-panic
...
Fix panic in integration-cli
Upstream-commit: 68c256cd40f69aac70ea3be330936daff2a909a9
Component: engine
2014-09-03 17:33:04 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
b4bc0df7c1
Merge pull request #7833 from crosbymichael/mem-test
...
Add more error info to TestDockerRunEchoStdoutWithMemoryLimit
Upstream-commit: 5f6b420f9141ae557ad53af8611578e392a46986
Component: engine
2014-09-02 07:51:04 +04:00
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
31e72dbddc
Merge pull request #7832 from crosbymichael/fix-nat-test
...
Make nat test less racy and accurate
Upstream-commit: 07040103132d34a92023260ed74092e46190ab81
Component: engine
2014-09-01 16:57:26 -07:00