d33438344b
Merge pull request #18727 from tonistiigi/partial-load
...
Add support for partial load
Upstream-commit: 6ee7c94263e367cfc03c6f08af3bdcd28f70ed7a
Component: engine
2015-12-18 11:10:55 -08:00
d5f830baed
Merge pull request #18771 from runcom/authz-fixes-1
...
authZ: more fixes
Upstream-commit: b714e03fddc71b0d1af7a27198ae5a342b8ce39f
Component: engine
2015-12-18 17:58:02 +01:00
e5974f1fbd
Merge pull request #18773 from runcom/rej-gitignore
...
.gitignore: do not ignore *.rej
Upstream-commit: 7f62d311bdf11f2bd8792c7e90e38edf2f77ef82
Component: engine
2015-12-18 17:48:36 +01:00
3a6aede7f5
Merge pull request #18721 from tiborvass/remove-dependencies-from-builder
...
Remove image and daemon dependencies from builder
Upstream-commit: 64d70de0a2aa29f565336e896b76c23c879a9a98
Component: engine
2015-12-18 17:19:55 +01:00
a04ac83e2f
.gitignore: do not ignore *.rej
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: fa7d676891d0dda30119ccfcf675a8f49c93073f
Component: engine
2015-12-18 17:12:54 +01:00
dcc6022170
Merge pull request #18561 from hqhq/hq_adapt_at_start
...
Adapt container settings when start
Upstream-commit: 1ca6690b4fbef191d242265c813cc1a4dd8ece25
Component: engine
2015-12-18 11:07:43 -05:00
760531cbbc
Merge pull request #18730 from calavera/remove_sockets_dependency
...
Remove api client lib dependency on tlsconfig and sockets packages.
Upstream-commit: b708a2249bfa7d9a7bff74b28264fd40ca4e6d1e
Component: engine
2015-12-18 10:35:51 -05:00
d63981ab4d
authZ: more fixes
...
- fix naming and formatting
- provide more context when erroring auth
- do not capitalize errors
- fix wrong documentation
- remove ugly remoteError{}
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 5a64c8027ecd2bebe773c9abd2e73c2fd7d23de1
Component: engine
2015-12-18 16:29:01 +01:00
871c2bc240
Merge pull request #18741 from WeiZhang555/debug-info
...
Better debug message for post form data
Upstream-commit: 47060efdb763305ed7c406ac3a62062d9f51ef21
Component: engine
2015-12-18 16:06:07 +01:00
c737574605
Merge pull request #18759 from mikedanese/doc-fix
...
daemon/logger: fix typo in godoc
Upstream-commit: 6bf8844f1179108b9fabd271a655bf9eaaf1ee8c
Component: engine
2015-12-17 19:26:41 -05:00
da94425c54
Remove api client lib dependency on tlsconfig and sockets packages.
...
- Let consumers to configure the http transport initially and apply or
defaults on top.
- Add function to initialize a new client based on environment
variables, useful for integrators.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: defd1519f77ef0caaab2cfeeb6433c8a24c62ffc
Component: engine
2015-12-17 19:04:49 -05:00
f814dbe783
daemon/logger: fix typo in godoc
...
Signed-off-by: Mike Danese <mikedanese@google.com >
Upstream-commit: 881a30c707141b06af0cc7a076b62ff338615f2b
Component: engine
2015-12-17 15:52:33 -08:00
5eac08b5e9
Merge pull request #18395 from LK4D4/default_cgroup_is_not_daemon
...
Use /docker as cgroup parent instead of docker
Upstream-commit: ff69b23dc09e544fb8ae9dccbd1f7992d2005b70
Component: engine
2015-12-17 13:59:00 -08:00
0f2a0bed09
Merge pull request #18744 from runcom/plugins-deadcode
...
pkg: plugins: remove dead code
Upstream-commit: 5553aab705d7ffed1bee94b8df860a36af767a20
Component: engine
2015-12-17 10:50:04 -08:00
ef849e6c0d
Merge pull request #18716 from clnperez/fix-blkio-tests
...
Update TestRunWithBlkioInvalidDevice Tests
Upstream-commit: 406da8616ccc13795cb85b9a34c459d3cda2ae82
Component: engine
2015-12-17 10:23:59 -08:00
fb0251b9a3
Merge pull request #18745 from runcom/pkg-version-String
...
pkg: version: add String method
Upstream-commit: 9681f0f0d4457f0e8dfb0c0473557a97e0cfef2b
Component: engine
2015-12-17 16:58:41 +01:00
1f6b8ad3e8
builder: remove daemon dependency in ContainerAttach
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: b0d947615335fe115b5b93c0c09912a4888e5b29
Component: engine
2015-12-17 16:57:08 +01:00
49f762b669
builder: remove daemon dependency in ContainerCreate()
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 03a170c48d660be72c387f1821ca48a713dd1cea
Component: engine
2015-12-17 16:57:08 +01:00
1dd48fd37d
Merge pull request #18739 from wenchma/typo
...
Fix typo error and update index
Upstream-commit: 742fd4fa633bfb105e501b74cc27871a972e8001
Component: engine
2015-12-17 15:43:14 +01:00
177c044c3a
Merge pull request #18590 from aaronlehmann/limit-v1-fallbacks
...
Limit v1 protocol fallbacks
Upstream-commit: 98be580794923df223ea623c55311c290d402c54
Component: engine
2015-12-17 14:44:05 +01:00
5d75803e83
Merge pull request #18743 from wenchma/plugin_not_found
...
Sync the docker network create api docs with the error code
Upstream-commit: 3f4dc492102bf4bceea92a59c78439420f7527c9
Component: engine
2015-12-17 12:16:23 +01:00
babed83c58
pkg: version: add String method
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 0d9f1e344a629e5abcd6a385952d22d19555f125
Component: engine
2015-12-17 11:52:23 +01:00
ce29ee35b2
Merge pull request #18662 from runcom/pkg-authZ-response
...
pkg: authorization: add Err to tweak response status code
Upstream-commit: 5baa93c04ef4a195df397914baf0a980c93d1271
Component: engine
2015-12-17 11:12:27 +01:00
98eeaeab93
pkg: authorization: add Err to tweak response status code
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 46e3a249a1971f8697ca338c9b02e27d36ddab12
Component: engine
2015-12-17 11:08:47 +01:00
6862b2ec45
pkg: plugins: remove dead code
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 1d2b62ceae17238f842bb2a7febf1bead8a982d5
Component: engine
2015-12-17 11:05:50 +01:00
fe1109030f
Sync the docker network create api docs with the error code
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 597835e6454be55963959f5f9d586b71517a7f1e
Component: engine
2015-12-17 17:48:50 +08:00
9a50c6c5f4
Merge pull request #18559 from ahmetalpbalkan/return-container-networks
...
Proposal: Add container networks list to /containers/json
Upstream-commit: 0f749ad55ab794872e601b4f665b07c0be07abfc
Component: engine
2015-12-17 10:11:18 +01:00
84afe8725b
Merge pull request #18622 from runcom/return-err
...
layer: layer_store.go: return on error
Upstream-commit: cf0acc8eb9bb83f0f8d603d72aeb3eef10de9da2
Component: engine
2015-12-17 09:10:09 +01:00
0f33f3e178
Better debug message for post form data
...
Print json format instead of default `%q`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: aaf65a47a7a6d9e45b77815ea252a302eefe1096
Component: engine
2015-12-17 15:55:39 +08:00
290e29f4c7
Fix typo error and update index
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: e0db2fa4da8f4de861ff83e6f19e7e6d4251289d
Component: engine
2015-12-17 15:40:10 +08:00
34a611be4f
Make v1 pull/push output consistent with v2
...
- Use layer DiffIDs for progress output in v1 push. This makes the
output consistent with v2 pushes, which means that a fallback to v1
won't start progress bars for a different set of IDs.
- Change wording used in v1 status updates to be consistent with v2.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 891bbc17ec2623897e32a3b9116cb2047ba70fdd
Component: engine
2015-12-16 15:02:24 -08:00
d2691dfadc
Do not fall back to the V1 protocol when we know we are talking to a V2 registry
...
If we detect a Docker-Distribution-Api-Version header indicating that
the registry speaks the V2 protocol, no fallback to V1 should take
place.
The same applies if a V2 registry operation succeeds while attempting a
push or pull.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a57478d65f1f5782cc746c260f9d841a0907ce54
Component: engine
2015-12-16 15:02:03 -08:00
7c30c7ccac
Merge pull request #15964 from duglin/APIVersion
...
Add a DOCKER_API_VERSION env var
Upstream-commit: 905f3336b2715b3960b5ff4f860db387797d9adf
Component: engine
2015-12-16 14:23:47 -08:00
2dc1c7dfce
Merge pull request #18671 from saturnism/patch-1
...
Updated REX-Ray plugin platform support.
Upstream-commit: cd1ace316df667719da810e2998c72dd2f2ef566
Component: engine
2015-12-16 14:16:12 -08:00
59f83ab1fb
Merge pull request #18586 from tonistiigi/tag-reference-squashed
...
Improve reference validation
Upstream-commit: dc81c2503163025ec5835cf11c53164a437bad6c
Component: engine
2015-12-16 23:08:02 +01:00
31bdfea928
Add support for partial load
...
Missing layers in tar will not cause an error if
layers are already loaded before.
Fixes #18723
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f946782316ea5fa635773587bd4c6da7ecf118b8
Component: engine
2015-12-16 13:46:40 -08:00
fb460ee943
Merge pull request #18717 from anusha-ragunathan/rm-mount-bld-iface
...
Remove Mount/Unmount from Builder interface.
Upstream-commit: e21d06a972b0edb44030db72b35e4882f05082e4
Component: engine
2015-12-16 13:34:06 -08:00
bc3565cc24
Merge pull request #18695 from dnephin/move_parse_link
...
Move ParseLink and validators into runconfig.parse where they are used
Upstream-commit: 3805c2909948c3827f242b1a8843320bddde9796
Component: engine
2015-12-16 16:15:52 -05:00
31f577ea49
Clean up reference type switches
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: eeb2d4c1adbe4e00f9fbcdc70f9ac31997968e1d
Component: engine
2015-12-16 11:58:53 -08:00
d17a157710
Improve reference parse errors
...
Fixes #18093
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 15d84a3a48efa12ed8bdc500f28ca58a7b1d1083
Component: engine
2015-12-16 11:58:53 -08:00
84a459522b
Remove unused repoinfo
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c1040b222c2520f8a0ebe14e81b5b7fe188e8dc6
Component: engine
2015-12-16 11:58:52 -08:00
9b8bb0d4e1
Update Named reference with validation of conversions
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ffded61dad76e4c6530359d879afe83907e409a7
Component: engine
2015-12-16 11:58:52 -08:00
020b74d545
Add own reference package wrapper
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2655954c2dd9d92c2394b04e4262543174c4c038
Component: engine
2015-12-16 11:58:52 -08:00
85ba54f0f4
Merge pull request #18722 from calavera/remove_unused_packages
...
Remove timeoutconn package, it's not used anywhere
Upstream-commit: cf7ccaf370b62fdf6d5b872f3c582370793656a9
Component: engine
2015-12-16 20:56:43 +01:00
e0a503a757
Merge pull request #18518 from MHBauer/spurious-timing
...
adjust test sleep timing to avoid spurious failure
Upstream-commit: 8ec00e6d0ecc49454e84d8bc67d9aeb9f1430e3f
Component: engine
2015-12-16 20:45:55 +01:00
5fc03c3956
Merge pull request #18719 from jfrazelle/vendor-updates
...
update and run vendor script
Upstream-commit: f8140332c0ea83a0821550452ed0aa26e2df3b3b
Component: engine
2015-12-16 11:27:02 -08:00
2d549dabbf
Merge pull request #18686 from cpuguy83/fix_btrfs_subvol_delete_panic
...
Fix btrfs recursive btrfs subvol delete
Upstream-commit: f57d56350ecf02a88f38219f55cbc42c1a9e07b5
Component: engine
2015-12-16 14:26:40 -05:00
f8a7e2bc3a
Move ParseLink and validators into runconfig.parse where they are used.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 233a4fc33ccaf279cc5a0ad1842ef5b053cccde7
Component: engine
2015-12-16 14:22:54 -05:00
3ec2752189
Remove timeoutconn package.
...
It's not used anywhere.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4d8ce0ef4a1ebf992906056f46b3f664b0bd30a4
Component: engine
2015-12-16 13:51:56 -05:00
4738f86f62
Merge pull request #18682 from calavera/replace_units_package
...
Replace pkg/units with docker/go-units.
Upstream-commit: b44b5bbc8ba48f50343602a21e7d44c017c1e23d
Component: engine
2015-12-16 10:48:59 -08:00
