Commit Graph

20395 Commits

Author SHA1 Message Date
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
73301b3d57 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>
Upstream-commit: 2efdb8cbf519f55836b0703e47c907e24a20eff6
Component: engine
2015-11-25 06:51:55 -08: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
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
b7eb93788c 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>
Upstream-commit: 09b7af9095246434c38ed1a9cc3a3ce6801ab180
Component: engine
2015-11-25 11:53:01 +11: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
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
b1098ef990 Move versioned references of inspect functions to the daemon.
Leaving only one versioned main function that a backend must implement.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 38abba9e2c8f7ac27bd26bf98685b51585922317
Component: engine
2015-11-24 14:03:39 -05:00
15fa54f208 Add container package for container APIs.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: fa8d96ebe21f5bb83e4d2da8e59234e701a8ee70
Component: engine
2015-11-24 14:03:07 -05:00
a62c883d3d move container files to a separate folder. Following changes will update them.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: a5bf10f37e150873fe5c0a6b5bccd8ac145bee58
Component: engine
2015-11-24 14:03:07 -05:00
0093235ece Merge pull request #17924 from aaronlehmann/content-addressability
Content addressability
Upstream-commit: a2ab05098d1033f6b282ccaf7301f2a31eda1a9c
Component: engine
2015-11-24 11:01:33 -08:00
6689d60843 Merge pull request #18150 from unclejack/add_python_dev
Dockerfile: add python-dev to fix Python.h errors
Upstream-commit: 0dec4403b0a6f5f56d37e22565bf060da8f399df
Component: engine
2015-11-24 10:31:52 -08:00
2908bc42ae Merge pull request #18196 from cpuguy83/18190_on_your_marks
Fix race in locker call to `dec()`
Upstream-commit: ac055a7d54dfec1763ea67ba037e689638c59762
Component: engine
2015-11-24 09:54:59 -08:00
08b6d9e261 Checkers on docker_cli_pull_local_test.go
Applying #16756 to integration-cli/docker_cli_pull_local_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: bc2682badc029c142d5053f6d7b6fec90de79b6e
Component: engine
2015-11-24 12:53:43 -05:00
b3a121616d Remove graph package
The graph package is no longer used for tag, image, or layer storage.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ed4d236e04e1a5724de578654939e3a42f7466cc
Component: engine
2015-11-24 09:40:25 -08:00
e105a29374 Update daemon and docker core to use new content addressable storage
Add distribution package for managing pulls and pushes. This is based on
the old code in the graph package, with major changes to work with the
new image/layer model.

Add v1 migration code.

Update registry, api/*, and daemon packages to use the reference
package's types where applicable.

Update daemon package to use image/layer/tag stores instead of the graph
package

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4352da7803d182a6013a5238ce20a7c749db979a
Component: engine
2015-11-24 09:40:25 -08:00
1f0b9bebab Add migratev1 package
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5fc0e1f324b05ce8cc7536cd807995c629e0843d
Component: engine
2015-11-24 09:40:25 -08:00
440fb17dd0 Add distribution package
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 694df3ff9f0f6b6acd4f3d866d443c740cce3f3f
Component: engine
2015-11-24 09:40:24 -08:00
bf504ef9d6 Add image store
The image store abstracts image handling. It keeps track of the
available images, and makes it possible to delete existing images or
register new ones. The image store holds references to the underlying
layers for each image.

The image/v1 package provides compatibility functions for interoperating
with older (non-content-addressable) image structures.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 01ba0a935b9227583ec05a96e85273cc2276bb93
Component: engine
2015-11-24 09:40:24 -08:00
480d299a2e Add tag store
The tag store associates tags and digests with image IDs. This
functionality used to be part of graph package. This commit splits it
off into a self-contained package with a simple interface.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 7de380c5c673411639d84e07c29830eb81cb1c8d
Component: engine
2015-11-24 09:40:24 -08:00
26cb84830f Add layer store
Layer store manages read-only and read-write layers on a union file system.
Read only layers are always referenced by content addresses.
Read-write layer identifiers are handled by the caller but upon registering
its difference, the committed read-only layer will be referenced by content
hash.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 500e77bad0b19b3b1c8e6ac195485adcb70daef1
Component: engine
2015-11-24 09:40:23 -08:00
bea0c01ef1 Fix race in locker call to dec()
Can't safely use uint32 for locker since we need to decrement the count,
which requires loading the unit and doing some math, which is inherintly
racey.
Instead use Int32 which we can safely use with atomic and AddInt32 with
`-1`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 985175fd8f8f662d5067bd62a89330e9a437375c
Component: engine
2015-11-24 11:59:09 -05:00
3f9a89737d Fixed broken links, and updated some to https
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: ad179e0e957a58181d71838eb0c2c7c019b4b2fb
Component: engine
2015-11-24 10:39:02 -05:00
d8ad25ae81 Merge pull request #18188 from wenchma/doc_update
Correct some typos for docs
Upstream-commit: 56305adf4a40d3e52fad8aa74db6be4d641dc8f6
Component: engine
2015-11-24 12:01:17 +01:00
44e9d91ec9 Merge pull request #18186 from aditirajagopal/16756-docker_api_inspect_unix_test
Checkers on docker_api_inspect_unix_test.go
Upstream-commit: 3a109fcfa2d5915f47d1ce7d98db2053b1bc3f74
Component: engine
2015-11-24 10:18:31 +01:00
d1c20a52eb Correct some typos for docs
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 4d66f18be07b13cf41c48190d813fc045bb46678
Component: engine
2015-11-24 15:14:32 +08:00
5c2015e2d5 Merge pull request #17714 from mikedougherty/cs-release-fixes
Fixes for release scripts
Upstream-commit: ae1fadeb96c8f64f1eebe2b729c07048398de013
Component: engine
2015-11-23 19:47:10 -08:00
0581fe3e96 Checkers on docker_api_inspect_unix_test.go
Applying #16756 to integration-cli/docker_api_inspect_unix_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: d53a9bcb13f7a37c8735c9ff4c336b7f021c6137
Component: engine
2015-11-23 22:03:14 -05:00
a265b48c9a Fixes for release scripts:
Add a flag to allow keeping bundles around (helps with CI)

Fix several problems in repo make targets

* quote DOCKER_EXPERIMENTAL variable
* pass-through arguments for gpg  provided to dpkg-sig are now quoted
  properly, so passphrases with shell-interpolated symbols can be used
* when determining deb suites, don't rely on 'origin' to be
  github.com/docker/docker

Fix some issues with deb repository creation from scratch

* Don't add empty components to the repository configuration as they
  will cause failure when generating.

Add old docker-engine-cs name to package conflicts

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: a15b67b1affb2eac5365614e55703f43b6f73e9b
Component: engine
2015-11-23 17:15:54 -08:00
8c41f24e1d Merge pull request #18171 from MHBauer/gh7205
update 'top' api endpoint documentation
Upstream-commit: 919a068fb6e38e480baaba80194b08054ae54bf1
Component: engine
2015-11-24 01:30:15 +01:00
a6f234dc9f Merge pull request #18147 from DieterReuter/sort-make-targets
Sorting make targets and DOCKER_ENV vars in alphabetical order
Upstream-commit: 4cb9d298c61ce0382aebaf9806b43f79c7084efb
Component: engine
2015-11-23 15:55:28 -08:00
0ec3e50e8d update 'top' api endpoint documentation
- update example based on '-ef' behavior
 - new example specifying ps args 'aux'
 - resolves #7205

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: e28e4c7840455e97ac277a121a429f99a0c079df
Component: engine
2015-11-23 15:41:34 -08:00
9a375b7073 Adjust docker-default profile when docker daemon is confined
Adjust the docker-default profile for when the docker daemon is running in
AppArmor confinement. To enable 'docker kill' we need to allow the container
to receive kill signals from the daemon.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Upstream-commit: 5cd6b3eca236df06e66777b15932b1a7fbb2e954
Component: engine
2015-11-23 15:20:01 -08:00
d83e223879 Policy extensions for user namespaces and docker exec
A few additions to the policy when running with user namespaces enabled
and when running 'docker exec'.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Upstream-commit: 6079d9d6a3b63fa8d9aa7a3981c6c37cc435bccb
Component: engine
2015-11-23 15:19:45 -08:00