Commit graph

20308 commits

Author SHA1 Message Date
Antonio Murdaca
a415b0c220 Merge pull request #18199 from aditirajagopal/16756-docker_cli_pull_local_test
Checkers on docker_cli_pull_local_test.go
2015-11-27 17:04:28 +01:00
Alexander Morozov
b8c21783f0 Merge pull request #17108 from coolljt0725/fix_remove_image
Fix docker rmi trying to remove a being used parent
2015-11-26 12:21:30 -08:00
Alexander Morozov
88aca3610f Merge pull request #18232 from mqliang/defer
move defer statement for readability
2015-11-26 12:20:55 -08:00
Alexander Morozov
0b5a28590f Merge pull request #18106 from runcom/bump-runc-libcontainer
vendor: bump libcontainer and its deps
2015-11-26 12:15:48 -08:00
Antonio Murdaca
65900d7603 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>
2015-11-26 16:29:59 +01:00
Vincent Demeester
2adeef9d1d Merge pull request #18262 from runcom/add-line
hack: make: .go-autogen: add blank line after build tag
2015-11-26 16:03:23 +01:00
Antonio Murdaca
a1733c6575 hack: make: .go-autogen: add blank line after build tag
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-26 13:16:39 +01:00
Sebastiaan van Stijn
9be2eea415 Merge pull request #18259 from SvenDowideit/move-to-docs-base-latest
Use FROM docs/base:latest again
2015-11-26 13:12:41 +01:00
Dan Walsh
cf4fb15088 The loggingMiddleware function is adding lots of messages to the log
When tools like kubernetes and cockpit are talking to the docker daemon
actively, we are seeing large number of log messages that look like debug
information.

For example

docker info adds the following line to journald.

Nov 26 07:09:23 dhcp-10-19-62-196.boston.devel.redhat.com docker[32686]: time="2015-11-26T07:09:23.124503455-05:00" level=info msg="GET /v1.22/info"

We think this should be Debug level not Info level.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-11-26 07:10:38 -05:00
Arnaud Porterie
bb11900393 Merge pull request #18220 from mqliang/temvarible
remove unnecessary temporary variable
2015-11-26 11:40:02 +01:00
Sven Dowideit
ce5177cf4b Use FROM docs/base:latest again
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-11-26 20:20:46 +10:00
Brian Goff
9ebf7dfae3 Merge pull request #18252 from aaronlehmann/tarstream-readcloser
Make TarStream return an io.ReadCloser
2015-11-25 21:35:21 -05:00
mqliang
478b773fe5 remove unnecessary temporary variable
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-11-26 10:25:55 +08:00
Doug Davis
7bb9fc415a Fix for zero-sized layers
Moved a defer up to a better spot.

Fixed TestUntarPathWithInvalidDest to actually fail for the right reason

Closes #18170

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-25 18:02:03 -08:00
Lei Jitang
0bbc9f1d2d Fix docker rmi trying to remove a being used parent
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-11-26 09:57:20 +08:00
David Calavera
3e51aff852 Merge pull request #18234 from thaJeztah/revert-vendor-changes
docs: revert README changes in vendored files
2015-11-25 17:37:04 -08:00
David Calavera
8339c892e8 Merge pull request #18245 from tonistiigi/tagstore-digest-adder
Validate adding digests to tagstore with go types
2015-11-25 17:36:33 -08:00
Aaron Lehmann
21278efaee 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>
2015-11-25 16:39:54 -08:00
Tonis Tiigi
20e759ab56 Validate adding digests to tagstore with go types
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-25 15:06:51 -08:00
Jess Frazelle
49088b0b89 Merge pull request #18243 from jfrazelle/fix-test
fix consistetly failing TestContainerRestartSuccess
2015-11-25 17:07:17 -05:00
Jessica Frazelle
f91115e3a2
fix consistetly failing TestContainerRestartSuccess on windows it looks up pids and does unixy things
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-25 13:04:59 -08:00
Michael Crosby
3422858653 Merge pull request #18213 from crawford/18212-fix-api-server
Revert "Return listenbuffer behavior"
2015-11-25 10:49:31 -08:00
Jessica Frazelle
c0f7fdc025
Fix parsing of apparmor pcre syntax
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-25 10:38:18 -08:00
David Calavera
ad67f324cc Merge pull request #17799 from runcom/deprecate-hc-cont-start
Deprecate HostConfig at API container start
2015-11-25 09:11:12 -08:00
Sebastiaan van Stijn
9bd5fd8926 Merge pull request #18223 from thaJeztah/fix-table-markup
Fix markup for markdown table
2015-11-25 16:26:53 +01:00
Brian Goff
1beb450fa6 Merge pull request #18215 from mountkin/test-for-18181
add a test to make sure port is allowed in images filter
2015-11-25 10:14:09 -05:00
Sebastiaan van Stijn
aa4fa98ed7 Merge pull request #18233 from moxiegirl/carry-17231
Moving prerequisite from #17231
2015-11-25 16:12:05 +01:00
Sebastiaan van Stijn
dd3634b3c1 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>
2015-11-25 16:07:43 +01:00
Vincent Demeester
1892556375 Merge pull request #18209 from martingkelly/18207-deb-multiarch
install.sh: fix for multiarch deb/ubuntu
2015-11-25 16:02:36 +01:00
moxiegirl
afaf288316 Merge pull request #17926 from HackToday/15896-fix-volume-options
Fixing the volume options doc
2015-11-25 06:57:05 -08:00
Vincent Demeester
06e4da9c5d Merge pull request #18228 from bboreham/existent-spelling
Fix spelling 'non-existant' -> 'non-existent'
2015-11-25 15:52:17 +01:00
Madhu Venugopal
2efdb8cbf5 Make discovery ttl and heartbeat configurable
Docker daemon uses kv-store as the host-discovery backend.
Discovery module tracks the liveness of a node through a simple
keepalive mechanism.  The keepalive mechanism depends on every
node performing heartbeat by registering itself with the discovery
module (via KV-Store Put operation). And for every Put operation,
the discovery module in all other nodes will receive a Watch
notification. That keeps the node alive.
Any node that fails to register itself within the TTL timer is
considered dead and removed from the discovery database.

The default timer (heartbeat = 20 seconds & ttl = 60 seconds)
works fine for small clusters.  But for large clusters, these
default timers are extremely aggressive and that causes high CPU
& most of the processing is spent managing the node discovery
and that impacts normal daemon operation.

Hence we need a way to make the discovery ttl and heartbeat
configurable.  As the cluster size grows, the user can change
these timers to make sure the daemon scales.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-11-25 06:51:55 -08:00
Mary Anthony
20f1a7b496 Moving prerquisite from #17231
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-25 06:51:23 -08:00
moxiegirl
1c3e4c5b9f Merge pull request #17231 from zelahi/9745-addapparmor-note
Adding note about apparmor install on Ubuntu
2015-11-25 06:45:42 -08:00
mqliang
302325a3aa move defer statement for readability
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-11-25 22:33:15 +08:00
Bryan Boreham
899caaca9c Fix spelling of 'existent'
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-11-25 13:45:37 +00:00
James Turnbull
9cbfa7b00b Merge pull request #18227 from thaJeztah/fix-api-changes
docs: move API changes to the correct API version
2015-11-25 08:20:13 -05:00
Sebastiaan van Stijn
a06d5273b3 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>
2015-11-25 14:10:18 +01:00
James Turnbull
e6a491fa8f Merge pull request #18225 from thaJeztah/fixup-tabs
docs: fixups for plugin drivers in docker info
2015-11-25 08:03:35 -05:00
Sebastiaan van Stijn
0a7e45e95c 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>
2015-11-25 13:54:54 +01:00
Sebastiaan van Stijn
bfdd94b0a8 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>
2015-11-25 12:38:15 +01:00
Kai Qiang Wu(Kennan)
41a36529a7 Fixing the volume options doc
Fixes #15896
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2015-11-25 03:56:55 -06:00
Zuhayr Elahi
0480da4d8c 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>
2015-11-24 22:53:14 -08:00
Shijiang Wei
8819b530db add a test to make sure port is allowed in images filter
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-11-25 10:46:23 +08:00
Alex Crawford
a8b84cd8fb Revert "Return listenbuffer behavior"
This reverts commit 281a48d092.

Signed-off-by: Alex Crawford <alex.crawford@coreos.com>
2015-11-24 18:32:57 -08:00
Martin Kelly
3e5ac74241 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>
2015-11-24 16:53:13 -08:00
Avi Miller
09b7af9095 Updated LICENSE file to match selinux-policy and the license in the docker-engine-selinux.spec file.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2015-11-25 11:53:01 +11:00
Alexander Morozov
900c8f5847 Merge pull request #18202 from aidanhs/aphs-content-addressability-layerstore
Rearrange layerstore locking
2015-11-24 14:53:10 -08:00
Brian Goff
87e7ee9142 Merge pull request #18201 from calavera/split_container_router
[Carry 17736] Container router and backend.
2015-11-24 17:07:04 -05:00
Aidan Hobson Sayers
cbf55b924f Rearrange layerstore locking
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-11-24 21:45:50 +00:00