Commit Graph

20159 Commits

Author SHA1 Message Date
mqliang 302325a3aa move defer statement for readability
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-11-25 22:33:15 +08: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
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
Alexander Morozov 5463e26570 Merge pull request #18203 from aidanhs/aphs-content-addressability-layerstore-releaselayer
Make releaseLayers iterative rather than recursive, remove useless func
2015-11-24 13:41:42 -08:00
Aidan Hobson Sayers a4d768538a Make releaseLayers iterative rather than recursive, remove useless func
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-11-24 19:40:09 +00:00
David Calavera 85c3c6865e Split container backend into several specialized interfaces.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-24 14:03:39 -05:00
David Calavera 38abba9e2c 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>
2015-11-24 14:03:39 -05:00
Dong Chen fa8d96ebe2 Add container package for container APIs.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-11-24 14:03:07 -05:00
Dong Chen a5bf10f37e move container files to a separate folder. Following changes will update them.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2015-11-24 14:03:07 -05:00
David Calavera a2ab05098d Merge pull request #17924 from aaronlehmann/content-addressability
Content addressability
2015-11-24 11:01:33 -08:00
Alexander Morozov 0dec4403b0 Merge pull request #18150 from unclejack/add_python_dev
Dockerfile: add python-dev to fix Python.h errors
2015-11-24 10:31:52 -08:00
Alexander Morozov ac055a7d54 Merge pull request #18196 from cpuguy83/18190_on_your_marks
Fix race in locker call to `dec()`
2015-11-24 09:54:59 -08:00
Tonis Tiigi ed4d236e04 Remove graph package
The graph package is no longer used for tag, image, or layer storage.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-24 09:40:25 -08:00
Tonis Tiigi 4352da7803 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>
2015-11-24 09:40:25 -08:00
Tonis Tiigi 5fc0e1f324 Add migratev1 package
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-24 09:40:25 -08:00
Aaron Lehmann 694df3ff9f Add distribution package
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-24 09:40:24 -08:00
Tonis Tiigi 01ba0a935b 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>
2015-11-24 09:40:24 -08:00
Aaron Lehmann 7de380c5c6 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>
2015-11-24 09:40:24 -08:00
Derek McGowan 500e77bad0 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>
2015-11-24 09:40:23 -08:00
moxiegirl 48c7a1618d Merge pull request #18195 from tophj-ibm/doc-link-fixes
Fixed broken links, and updated some to https
2015-11-24 09:30:15 -08:00
Brian Goff 985175fd8f 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>
2015-11-24 11:59:09 -05:00
Christopher Jones ad179e0e95 Fixed broken links, and updated some to https
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-11-24 10:39:02 -05:00
Sebastiaan van Stijn 56305adf4a Merge pull request #18188 from wenchma/doc_update
Correct some typos for docs
2015-11-24 12:01:17 +01:00
Vincent Demeester 3a109fcfa2 Merge pull request #18186 from aditirajagopal/16756-docker_api_inspect_unix_test
Checkers on docker_api_inspect_unix_test.go
2015-11-24 10:18:31 +01:00
Wen Cheng Ma 4d66f18be0 Correct some typos for docs
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-11-24 15:14:32 +08:00
Tianon Gravi ae1fadeb96 Merge pull request #17714 from mikedougherty/cs-release-fixes
Fixes for release scripts
2015-11-23 19:47:10 -08:00
Aditi Rajagopal d53a9bcb13 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>
2015-11-23 22:03:14 -05:00
Mike Dougherty a15b67b1af 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>
2015-11-23 17:15:54 -08:00
Sebastiaan van Stijn 919a068fb6 Merge pull request #18171 from MHBauer/gh7205
update 'top' api endpoint documentation
2015-11-24 01:30:15 +01:00
David Calavera 4cb9d298c6 Merge pull request #18147 from DieterReuter/sort-make-targets
Sorting make targets and DOCKER_ENV vars in alphabetical order
2015-11-23 15:55:28 -08:00
Morgan Bauer e28e4c7840
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>
2015-11-23 15:41:34 -08:00
Alexander Morozov 18c9fe0cec Merge pull request #18175 from crosbymichael/arm-doc
Change and move ARM.md doc to project
2015-11-23 13:57:42 -08:00
Michael Crosby ffd36a14e7 Move arm info to project/
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-11-23 13:54:17 -08:00
Michael Crosby 2ec186377e Remove scaleway info
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-11-23 13:53:54 -08:00
David Calavera aa22191093 Merge pull request #17356 from HuKeping/warn-on-oom
Warning out when disalbe oom killer but not set the memory limit
2015-11-23 12:43:04 -08:00
Alexander Morozov 9687008378 Merge pull request #18104 from hypriot/17802-remove-journald-to-fix-dynbinary-build-on-ARM
remove journald to fix dynbinary build on ARM
2015-11-23 10:38:45 -08:00
Tianon Gravi 05d1a5aed6 Merge pull request #18152 from rgl/master
mkimage-arch: remove the test container after run
2015-11-23 10:35:15 -08:00
Alexander Morozov 804d2f73c8 Merge pull request #18080 from aditirajagopal/16756-docker_api_images_test
Checkers on integration-cli/docker_api_images_test
2015-11-23 10:21:52 -08:00
Sebastiaan van Stijn 86377e541d Merge pull request #18157 from Djelibeybi/master
Fix CHANGELOG.md
2015-11-23 18:42:38 +01:00
James Turnbull 097bc4881f Merge pull request #18167 from duglin/FixTagHelp
Add more to tag's -f flag's help
2015-11-23 11:59:22 -05:00
James Turnbull 2bc792e3bb Merge pull request #18132 from WeiZhang555/api-changelog
Add API change to docs
2015-11-23 11:57:46 -05:00
Sebastiaan van Stijn 5017a5dd69 Merge pull request #18161 from duglin/Issue18017
Add some docs about build-arg's impact on the cache
2015-11-23 17:57:28 +01:00
Doug Davis 5bf4766fca Add some docs about build-arg's impact on the cache
Closes #18017

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-23 08:51:11 -08:00
Aditi Rajagopal 463c53c715 Checkers on integration-cli/docker_api_images_test
Applying #16756 to integration-cli/docker_api_images_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-23 10:33:32 -05:00
Doug Davis a70079ea23 Add more to tag's -f flag's help
Was noticed in #9798

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-11-23 07:20:10 -08:00