da19b040bf
Merge pull request #18281 from runcom/18199-followup
...
integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s)
Upstream-commit: dd25d2c3db0c96cd74bbec786203a708079c20f5
Component: engine
2015-11-28 13:03:09 +01:00
873d694f0a
integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s)
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 4c3c3fedf81a47f9da1a92665ae53e81ce30db62
Component: engine
2015-11-27 17:10:09 +01:00
e754309ce0
Merge pull request #18199 from aditirajagopal/16756-docker_cli_pull_local_test
...
Checkers on docker_cli_pull_local_test.go
Upstream-commit: a415b0c2208bd426df731491fe6e4714156f3527
Component: engine
2015-11-27 17:04:28 +01:00
c3cf7195f6
Merge pull request #17108 from coolljt0725/fix_remove_image
...
Fix docker rmi trying to remove a being used parent
Upstream-commit: b8c21783f0c7915779de3fa487f233ebc145738d
Component: engine
2015-11-26 12:21:30 -08:00
cb358947f2
Merge pull request #18232 from mqliang/defer
...
move defer statement for readability
Upstream-commit: 88aca3610fecdf790c4604ed705d31f8d17ef8e6
Component: engine
2015-11-26 12:20:55 -08:00
71c2fd53b4
Merge pull request #18106 from runcom/bump-runc-libcontainer
...
vendor: bump libcontainer and its deps
Upstream-commit: 0b5a28590f278881309b77f42be06a1da4212e1e
Component: engine
2015-11-26 12:15:48 -08:00
c93754a0f9
vendor: bump deps
...
bump runc/libcontainer to v0.0.5
bump runc deps to latest
bump docker/libnetwork to 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 65900d7603368f045c904d178fab05a13c44a066
Component: engine
2015-11-26 16:29:59 +01:00
689c530381
Merge pull request #18262 from runcom/add-line
...
hack: make: .go-autogen: add blank line after build tag
Upstream-commit: 2adeef9d1d4a0cf1fb6b0d56dc246008d72f777e
Component: engine
2015-11-26 16:03:23 +01:00
af5191b5dd
hack: make: .go-autogen: add blank line after build tag
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a1733c6575339e254f2b49625d597f46f883fe42
Component: engine
2015-11-26 13:16:39 +01:00
1cdb10c9d0
Merge pull request #18259 from SvenDowideit/move-to-docs-base-latest
...
Use FROM docs/base:latest again
Upstream-commit: 9be2eea41593db2e6203097592e9347bb40c5637
Component: engine
2015-11-26 13:12:41 +01:00
b13551acbe
Merge pull request #18220 from mqliang/temvarible
...
remove unnecessary temporary variable
Upstream-commit: bb11900393df21002a7608c007c90438522be7dd
Component: engine
2015-11-26 11:40:02 +01:00
97d5f4d62b
Use FROM docs/base:latest again
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ce5177cf4b175435a667aeced586f653a9203790
Component: engine
2015-11-26 20:20:46 +10:00
72a5c00834
Merge pull request #18252 from aaronlehmann/tarstream-readcloser
...
Make TarStream return an io.ReadCloser
Upstream-commit: 9ebf7dfae324d8fad524c9578ed850bf3b116d32
Component: engine
2015-11-25 21:35:21 -05:00
e8167fa92b
remove unnecessary temporary variable
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 478b773fe5aa7b9bdfc571d3e8f8bc3bc47826ea
Component: engine
2015-11-26 10:25:55 +08:00
2d14ff7cb5
Fix docker rmi trying to remove a being used parent
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 0bbc9f1d2d0effcf33d82d24bbf97f30b90619de
Component: engine
2015-11-26 09:57:20 +08:00
75d1f1d370
Merge pull request #18234 from thaJeztah/revert-vendor-changes
...
docs: revert README changes in vendored files
Upstream-commit: 3e51aff852a7e014dee770c02b40f90a2ef07503
Component: engine
2015-11-25 17:37:04 -08:00
aa606769fe
Merge pull request #18245 from tonistiigi/tagstore-digest-adder
...
Validate adding digests to tagstore with go types
Upstream-commit: 8339c892e803c88a5269be29f76f5d74e30d5816
Component: engine
2015-11-25 17:36:33 -08:00
c88fa0bb83
Make TarStream return an io.ReadCloser
...
Currently, the resources associated with the io.Reader returned by
TarStream are only freed when it is read until EOF. This means that
partial uploads or exports (for example, in the case of a full disk or
severed connection) can leak a goroutine and open file. This commit
changes TarStream to return an io.ReadCloser. Resources are freed when
Close is called.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 21278efaee563b356851a530b08b0537fee095d7
Component: engine
2015-11-25 16:39:54 -08:00
c91b830a96
Validate adding digests to tagstore with go types
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 20e759ab56e9c17cfe0fbe839cdd4ac9ee6f0752
Component: engine
2015-11-25 15:06:51 -08:00
01bcd002ce
Merge pull request #18243 from jfrazelle/fix-test
...
fix consistetly failing TestContainerRestartSuccess
Upstream-commit: 49088b0b8947485dc8f639b1bb9e81b07b865516
Component: engine
2015-11-25 17:07:17 -05:00
22b751507a
fix consistetly failing TestContainerRestartSuccess on windows it looks up pids and does unixy things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: f91115e3a26f612001bde5f55cd59c69f7243104
Component: engine
2015-11-25 13:04:59 -08:00
60f58722cf
Merge pull request #18213 from crawford/18212-fix-api-server
...
Revert "Return listenbuffer behavior"
Upstream-commit: 34228586530fb3c51c4faa8ec73b9e15926893ea
Component: engine
2015-11-25 10:49:31 -08:00
7e8c2fe30e
Merge pull request #17799 from runcom/deprecate-hc-cont-start
...
Deprecate HostConfig at API container start
Upstream-commit: ad67f324cc59807918eea747cc110d39a2bc1ca2
Component: engine
2015-11-25 09:11:12 -08:00
265697d24d
Merge pull request #18223 from thaJeztah/fix-table-markup
...
Fix markup for markdown table
Upstream-commit: 9bd5fd892617c589606efda5e209e2400c6946d7
Component: engine
2015-11-25 16:26:53 +01:00
9d6bd6fa95
Merge pull request #18215 from mountkin/test-for-18181
...
add a test to make sure port is allowed in images filter
Upstream-commit: 1beb450fa68dd32e2ef6cab539f39ad86ea5e192
Component: engine
2015-11-25 10:14:09 -05:00
c05f5f5162
Merge pull request #18233 from moxiegirl/carry-17231
...
Moving prerequisite from #17231
Upstream-commit: aa4fa98ed77f80a9db5e8f7c23ef58a4537a72e1
Component: engine
2015-11-25 16:12:05 +01:00
d55f3e0dd1
revert README changes in vendored files
...
PR https://github.com/docker/docker/pull/17986
inadvertently included changes to some vendored files.
This reverts those changes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dd3634b3c1926cac2b714be4e7b5be49dfc0d0f2
Component: engine
2015-11-25 16:07:43 +01:00
2d2b79f090
Merge pull request #18209 from martingkelly/18207-deb-multiarch
...
install.sh: fix for multiarch deb/ubuntu
Upstream-commit: 1892556375ee4425e7c0a8e3e3cfb5f5e7a2c49c
Component: engine
2015-11-25 16:02:36 +01:00
f09258ddea
Merge pull request #17926 from HackToday/15896-fix-volume-options
...
Fixing the volume options doc
Upstream-commit: afaf288316d0cce4a2d02a51aaab0b8017bdac27
Component: engine
2015-11-25 06:57:05 -08:00
7dc8164a18
Merge pull request #18228 from bboreham/existent-spelling
...
Fix spelling 'non-existant' -> 'non-existent'
Upstream-commit: 06e4da9c5d6af18fe7e92482f5629dbcbdf56897
Component: engine
2015-11-25 15:52:17 +01:00
109d171010
Moving prerquisite from #17231
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 20f1a7b496fad1556ccc61f35d58533f885e0ab2
Component: engine
2015-11-25 06:51:23 -08:00
f919763365
Merge pull request #17231 from zelahi/9745-addapparmor-note
...
Adding note about apparmor install on Ubuntu
Upstream-commit: 1c3e4c5b9f53917998d94afb3e53bdbea16472c4
Component: engine
2015-11-25 06:45:42 -08:00
5cc8cf959e
move defer statement for readability
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 302325a3aaaae030f58c84bdaf88a5c8266af12c
Component: engine
2015-11-25 22:33:15 +08:00
89ca8a3104
Fix spelling of 'existent'
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
Upstream-commit: 899caaca9c990067d541231c6d288de89dbb79e7
Component: engine
2015-11-25 13:45:37 +00:00
eb58bc2fc0
Merge pull request #18227 from thaJeztah/fix-api-changes
...
docs: move API changes to the correct API version
Upstream-commit: 9cbfa7b00bd3b542632b40c5726316923d90cd18
Component: engine
2015-11-25 08:20:13 -05:00
7da657059d
docs: move API changes to the correct API version
...
These changes were made as part of https://github.com/docker/docker/pull/17478
but inadvertently added to the v1.21 API version.
Also added a short description to the API changelog.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a06d5273b3cb72f68fc32da26955842287314970
Component: engine
2015-11-25 14:10:18 +01:00
95aba8531e
Merge pull request #18225 from thaJeztah/fixup-tabs
...
docs: fixups for plugin drivers in docker info
Upstream-commit: e6a491fa8fe3fa09be3f803da97e7d6efc3162e5
Component: engine
2015-11-25 08:03:35 -05:00
26c51ea4a2
docs: fixups for plugin drivers in docker info
...
Plugin drivers were added to docker info in
https://github.com/docker/docker/pull/17300
but not added to the example output in the online
docs.
Also fixed mixed tabs/spaces in the API documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0a7e45e95c9e554c73581def80881534800a2b28
Component: engine
2015-11-25 13:54:54 +01:00
7073afc49a
Fix markup for markdown table
...
Our tooling used to convert Markdown to HTML doesn't
properly handle '|' symbols embeded in code blocks
inside a table.
Changed the table to a plain HTML table as a workaround.
Also fixed indentation levels of two code examples.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bfdd94b0a8f0641f7bced9d3089a78e9550a7b04
Component: engine
2015-11-25 12:38:15 +01:00
51a4df16fb
Fixing the volume options doc
...
Fixes #15896
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 41a36529a71d96a9ed9d334a6efa72b4616c2abd
Component: engine
2015-11-25 03:56:55 -06:00
b2c10cb07a
1. Adding note about apparmor install on Ubuntu
...
2. modified page to remove note for apparmor and added it as a requirement for installing it on ubuntu
3. moved note to under prerequisites section
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com >
Upstream-commit: 0480da4d8cbd330732f005ea7ec1be93cc00e617
Component: engine
2015-11-24 22:53:14 -08:00
80e1f00303
add a test to make sure port is allowed in images filter
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 8819b530dbb692de6eac5cf0e67700374f14aa09
Component: engine
2015-11-25 10:46:23 +08:00
c862a7ae5b
Revert "Return listenbuffer behavior"
...
This reverts commit 281a48d092fa84500c63b984ad45c59a06f301c4.
Signed-off-by: Alex Crawford <alex.crawford@coreos.com >
Upstream-commit: a8b84cd8fb63d237b488f8b137b45187a6efaa5a
Component: engine
2015-11-24 18:32:57 -08:00
18fcb12c86
install.sh: fix for multiarch deb/ubuntu
...
Currently, the Docker repos will trigger apt-get errors on a
multiarch-configured deb system because the repos don't contain all
architectures. For example, on a multiarch system supporting amd64 and
armhf, apt-get will look for armhf Docker packages, fail to find them,
and error out.
Fix this by qualifying the repo line with the currently active
architecture.
This fixes issue #18207 .
Signed-off-by: Martin Kelly <martin@surround.io >
Upstream-commit: 3e5ac742417dc9461dd090c29ee9971ff0974adb
Component: engine
2015-11-24 16:53:13 -08:00
4190d23ba7
Merge pull request #18202 from aidanhs/aphs-content-addressability-layerstore
...
Rearrange layerstore locking
Upstream-commit: 900c8f5847b9f6a51a4a1a3d03631bad7b3149db
Component: engine
2015-11-24 14:53:10 -08:00
ce48cb1f48
Merge pull request #18201 from calavera/split_container_router
...
[Carry 17736] Container router and backend.
Upstream-commit: 87e7ee914261efd2580accae98569466f42cd003
Component: engine
2015-11-24 17:07:04 -05:00
6064788a9b
Rearrange layerstore locking
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: cbf55b924f05a918c9b95795f6c69aa89d180530
Component: engine
2015-11-24 21:45:50 +00:00
62cd0ad97a
Merge pull request #18203 from aidanhs/aphs-content-addressability-layerstore-releaselayer
...
Make releaseLayers iterative rather than recursive, remove useless func
Upstream-commit: 5463e2657009ee904e83f5df256dae9d12168f1a
Component: engine
2015-11-24 13:41:42 -08:00
305f6f5e5a
Make releaseLayers iterative rather than recursive, remove useless func
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: a4d768538afb2f14e270509343c67b13ba3f6ddf
Component: engine
2015-11-24 19:40:09 +00:00
08fb779389
Split container backend into several specialized interfaces.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 85c3c6865ef4eb334f9fbdec6dd270d525b68914
Component: engine
2015-11-24 14:03:39 -05:00
