2cab6a8278
updated fedora yum to dnf package manager Signed-off-by: Tyler Brown <tylers.pile@gmail.com>
...
Upstream-commit: 0635403536802063e8633ab04a6a825a1daa02c4
Component: engine
2015-12-19 15:04:19 -05:00
cd79f6b524
Merge pull request #18767 from wenchma/add_checkduplicate_test
...
Add network create api test on CheckDuplicate
Upstream-commit: 58c049595fba7cb509d8a6656ecce6389c34a5a5
Component: engine
2015-12-19 10:46:11 -05:00
8acdb0b4d5
Merge pull request #18684 from cdauth/volume-docs
...
Add note to volume docs that data is not copied to mounted volumes
Upstream-commit: 69fbdf4294b9c062bc711b978efcde82e40a293f
Component: engine
2015-12-19 15:29:44 +01:00
ea70c9d5d6
Add network create api test on CheckDuplicate
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 5649dae89bbbb356a24560c1d3164722b2207344
Component: engine
2015-12-19 22:29:30 +08:00
3c6477529c
Merge pull request #18769 from runcom/docs-auth-1
...
docs: extend: authorization.md: add a note about confidential stuff in Err
Upstream-commit: eaf7932fafdfdbcefa3be3ccacab016938969cf4
Component: engine
2015-12-19 14:53:25 +01:00
4257361f33
Document process for patch-releases
...
This documents the procedures around creating patch-releases.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a5d8e41e8287d26ca2b32a2712b87088a84b3bfb
Component: engine
2015-12-19 14:49:49 +01:00
295cafe7dd
docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: aada8d81177de793db38845ff3a26949436e1ed6
Component: engine
2015-12-19 09:04:29 +01:00
fdba0e61b5
Merge pull request #18779 from aditirajagopal/18750-new-string-method
...
pkg/version.Version: use the new String() method
Upstream-commit: 7ff61dd592335c7b3673b41153d9cf8995e468a3
Component: engine
2015-12-18 21:21:17 -05:00
ce07d20209
Merge pull request #18763 from calavera/fix_raw_inspect
...
Print the raw inspected elements when there is no template for `docker inspect`.
Upstream-commit: 58ebc71272d3facec798664366cc169aa8df8449
Component: engine
2015-12-18 15:25:38 -08:00
4b736dc17f
Merge pull request #18651 from vbatts/dm-cleanup
...
loopback (and devicemapper) cleanup
Upstream-commit: 54f945994a0eb79c43c8c34fc77625dc56c0c421
Component: engine
2015-12-18 15:13:28 -08:00
76f3bf50c1
pkg/version.Version: use the new String() method
...
Resolves #18750
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 278e75800c7be10ca43ffb11de25cd342da106fe
Component: engine
2015-12-18 15:29:32 -05:00
cc50cf65a0
Merge pull request #18761 from anusha-ragunathan/add-build-routes
...
Create build router separate from image router.
Upstream-commit: 92605b823d4facbe9076b58dd0b0d77101529ad9
Component: engine
2015-12-18 21:09:43 +01:00
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
8b5a2050f9
loopback: separate loop logic from devicemapper
...
The loopback logic is not technically exclusive to the devicemapper
driver. This reorganizes the code such that the loopback code is usable
outside of the devicemapper package and driver.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: af597527121c0ad973e9d0ae4f9cf970da1513cc
Component: engine
2015-12-18 10:57:43 -05:00
e963d775a7
devicemapper: remove unused type mapping
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: a292c04c01cbe4a6c9f74e7cf3b0315249ed8993
Component: engine
2015-12-18 10:44:06 -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
7d0507241f
docs: extend: authorization.md: add a note about confidential stuff in Err
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 1e28f04fec70affd8fae57f4bdd23a84853f4efc
Component: engine
2015-12-18 11:28:28 +01:00
50b12bd7e1
Print the raw inspected elements when there is no template for docker inspect.
...
Otherwise we're ignoring the fields that Swarm adds to the output.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1f5674363e4dd81c9ecd52ef3e1f252c76784697
Component: engine
2015-12-17 23:17:52 -05:00
9bd14de85f
fix incorrect ip addresses in networkingcontainers
...
Signed-off-by: Donovan Jones <git@gamma.net.nz >
Upstream-commit: 2bd8322dba34eb5855ca5cd3af04f0f1289b3d45
Component: engine
2015-12-18 16:21:24 +13:00
71b76682f6
Create build router separate from image router.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: f8dc044aecd6fa00c33dc6a72321a3e249a0b40d
Component: engine
2015-12-17 16:56:11 -08: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
1429fb46b1
Update gcc from 5.2 to 5.3
...
gcc 5.3 is out, so let's use the new one!
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: fab75bffb01486ca73edb5b72868929007cf7d40
Component: engine
2015-12-17 13:37:50 -06: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
717469465c
Move DOCKER_ENGINE_ envs to integration-daemon-setup to allow build w/o Makefile
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 94fb7458eae64ad58853bf7170790848c8979af9
Component: engine
2015-12-17 18:55:45 +01:00
bd0f152278
update Dockerfile to reflect latest changes
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com >
Upstream-commit: 43ee5643261f9b8741ab23a1749b3d55e13171c5
Component: engine
2015-12-17 18:54:00 +01: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
