Commit Graph
10342 Commits
Author SHA1 Message Date
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
Victor Vieux 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
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
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
Alexandr Morozov 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
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
Victor Vieux 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
Michael Crosby 5f3cf0d988 Make nat test less racy and accurate
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 72652c597385980c1bf6adebe4cded760dbf2663
Component: engine
2014-09-01 16:54:32 -07:00
Michael Crosby 2354bba277 Merge pull request #7830 from crosbymichael/update-libcontainer-sep1
Update libcontainer to version 55430d0db7c6bb1198c0bb573a9700a859d5ec26
Upstream-commit: ca63cceae5bb8420c2af866e1fa83e84e7770eeb
Component: engine
2014-09-01 16:13:38 -07:00
Victor Vieux e6e2dac447 Merge pull request #7780 from unclejack/disallow_dns_with_net_host
disallow net=host and net=container with links and dns
Upstream-commit: 40cc889a7c1739d1bf9bc49e968fbb754a6b7a92
Component: engine
2014-09-01 15:32:08 -07:00
Michael Crosby 0886b9cbe5 Update mount struct with reference
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 688741df31396ece5f72cbc5ecc0250b3d06a8bc
Component: engine
2014-09-01 15:18:30 -07:00
Michael Crosby 3d48a27630 Update libcontainer to 55430d0db7c6bb1198c0bb573a9
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: cf31787cd0559012c1ee581eaf27143af1cc6ce3
Component: engine
2014-09-01 15:18:25 -07:00
Michael Crosby c54ffbd9ed Merge pull request #7829 from crosbymichael/process-config
Refactor exec drivers for multi process
Upstream-commit: 7ff488e74183dd4a5b255bdfdd3bfd166ed427ba
Component: engine
2014-09-01 14:41:24 -07:00
Vishnu Kannan 559392405c Rename 'StdConfig' to 'StreamConfig'.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 3a7e07355a1ad67f71ee4255e06526186fd48f7a
Component: engine
2014-09-01 14:31:01 -07:00
Vishnu Kannan a7e2cb4124 Refactoring execdriver.Command and Container structs to support 'docker exec' and other
similar features in the future.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 4aa5da278f49c889d43191f82ff42d3a95266d62
Component: engine
2014-09-01 14:30:16 -07:00
James Turnbull a4859208cd Merge pull request #7819 from SvenDowideit/debian-wheezy-notes
Debian wheezy notes - minor md tweaks
Upstream-commit: 9ffb0f76f2efa1b5a93f78dec8bcd256f3d99fd2
Component: engine
2014-09-01 15:45:47 -04:00
Michael Crosby 06de394335 Merge pull request #7825 from LK4D4/move_integration_to_cli
Move integration to cli
Upstream-commit: efc6c9ba2f51a6103a9c982ab15e508e28e64831
Component: engine
2014-09-01 11:38:57 -07:00
Michael Crosby 94c61e97d5 Merge pull request #7812 from erikh/fix_top
docker top: fix command when multiple arguments are supplied
Upstream-commit: 388ed88042b54b3e0fff7096c1749f2bfc2c7e40
Component: engine
2014-09-01 11:31:38 -07:00
Michael Crosby ba45bffa03 Merge pull request #7809 from LK4D4/use_increment
Use increment operator
Upstream-commit: ec87846908287fd87d628a4b74f26e96c9c5f9cc
Component: engine
2014-09-01 11:16:25 -07:00
Michael Crosby db97aa6a31 Merge pull request #7791 from SvenDowideit/mflag-Visit-returns-nil-flag
fs.Visit() returns nil flag
Upstream-commit: ac69b661eed2fe410bd4275951e31c6f93e274d3
Component: engine
2014-09-01 11:13:32 -07:00
Victor Vieux ca3fe8ca1e Merge pull request #7814 from erikh/fix_parser_env
Fix panic when `ENV ARG=ARG` is used.
Upstream-commit: 09d36709076ac56387a12a7465b6a236e1253ff5
Component: engine
2014-09-01 11:03:21 -07:00
Alexandr Morozov 4f814a8405 Move TestRunCidFileCheckIDLength to integration-cli
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 195cee99839a77afec7aaf7fe43cb5a9ceae4f57
Component: engine
2014-09-01 20:15:20 +04:00
Alexandr Morozov 797834a228 Move TestRunCidFileCleanupIfEmpty to integration-cli
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 8892320835ad2b21b0efd4848d2af0d8a791a8e9
Component: engine
2014-09-01 19:55:39 +04:00