Wen Cheng Ma
5649dae89b
Add network create api test on CheckDuplicate
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-19 22:29:30 +08:00
Sebastiaan van Stijn
eaf7932faf
Merge pull request #18769 from runcom/docs-auth-1
...
docs: extend: authorization.md: add a note about confidential stuff in Err
2015-12-19 14:53:25 +01:00
Sebastiaan van Stijn
a5d8e41e82
Document process for patch-releases
...
This documents the procedures around creating patch-releases.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-19 14:49:49 +01:00
Antonio Murdaca
aada8d8117
docs: userguide: labels-custom-metadsata.md: update syntax for emtpy value labels
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-19 09:04:29 +01:00
Doug Davis
7ff61dd592
Merge pull request #18779 from aditirajagopal/18750-new-string-method
...
pkg/version.Version: use the new String() method
2015-12-18 21:21:17 -05:00
Alexander Morozov
58ebc71272
Merge pull request #18763 from calavera/fix_raw_inspect
...
Print the raw inspected elements when there is no template for `docker inspect`.
2015-12-18 15:25:38 -08:00
David Calavera
54f945994a
Merge pull request #18651 from vbatts/dm-cleanup
...
loopback (and devicemapper) cleanup
2015-12-18 15:13:28 -08:00
Aditi Rajagopal
278e75800c
pkg/version.Version: use the new String() method
...
Resolves #18750
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-12-18 15:29:32 -05:00
Antonio Murdaca
92605b823d
Merge pull request #18761 from anusha-ragunathan/add-build-routes
...
Create build router separate from image router.
2015-12-18 21:09:43 +01:00
David Calavera
6ee7c94263
Merge pull request #18727 from tonistiigi/partial-load
...
Add support for partial load
2015-12-18 11:10:55 -08:00
Vincent Demeester
b714e03fdd
Merge pull request #18771 from runcom/authz-fixes-1
...
authZ: more fixes
2015-12-18 17:58:02 +01:00
Tibor Vass
7f62d311bd
Merge pull request #18773 from runcom/rej-gitignore
...
.gitignore: do not ignore *.rej
2015-12-18 17:48:36 +01:00
Vincent Demeester
64d70de0a2
Merge pull request #18721 from tiborvass/remove-dependencies-from-builder
...
Remove image and daemon dependencies from builder
2015-12-18 17:19:55 +01:00
Antonio Murdaca
fa7d676891
.gitignore: do not ignore *.rej
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-18 17:12:54 +01:00
Phil Estes
1ca6690b4f
Merge pull request #18561 from hqhq/hq_adapt_at_start
...
Adapt container settings when start
2015-12-18 11:07:43 -05:00
Vincent Batts
af59752712
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>
2015-12-18 10:57:43 -05:00
Vincent Batts
a292c04c01
devicemapper: remove unused type mapping
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-12-18 10:44:06 -05:00
Brian Goff
b708a2249b
Merge pull request #18730 from calavera/remove_sockets_dependency
...
Remove api client lib dependency on tlsconfig and sockets packages.
2015-12-18 10:35:51 -05:00
Antonio Murdaca
5a64c8027e
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>
2015-12-18 16:29:01 +01:00
Antonio Murdaca
47060efdb7
Merge pull request #18741 from WeiZhang555/debug-info
...
Better debug message for post form data
2015-12-18 16:06:07 +01:00
Antonio Murdaca
1e28f04fec
docs: extend: authorization.md: add a note about confidential stuff in Err
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-18 11:28:28 +01:00
David Calavera
1f5674363e
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>
2015-12-17 23:17:52 -05:00
Anusha Ragunathan
f8dc044aec
Create build router separate from image router.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2015-12-17 16:56:11 -08:00
Doug Davis
6bf8844f11
Merge pull request #18759 from mikedanese/doc-fix
...
daemon/logger: fix typo in godoc
2015-12-17 19:26:41 -05:00
David Calavera
defd1519f7
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>
2015-12-17 19:04:49 -05:00
Mike Danese
881a30c707
daemon/logger: fix typo in godoc
...
Signed-off-by: Mike Danese <mikedanese@google.com>
2015-12-17 15:52:33 -08:00
Jess Frazelle
ff69b23dc0
Merge pull request #18395 from LK4D4/default_cgroup_is_not_daemon
...
Use /docker as cgroup parent instead of docker
2015-12-17 13:59:00 -08:00
Alexander Morozov
5553aab705
Merge pull request #18744 from runcom/plugins-deadcode
...
pkg: plugins: remove dead code
2015-12-17 10:50:04 -08:00
David Calavera
406da8616c
Merge pull request #18716 from clnperez/fix-blkio-tests
...
Update TestRunWithBlkioInvalidDevice Tests
2015-12-17 10:23:59 -08:00
Stefan Scherer
94fb7458ea
Move DOCKER_ENGINE_ envs to integration-daemon-setup to allow build w/o Makefile
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2015-12-17 18:55:45 +01:00
Govinda Fichtner
43ee564326
update Dockerfile to reflect latest changes
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
2015-12-17 18:54:00 +01:00
Tibor Vass
9681f0f0d4
Merge pull request #18745 from runcom/pkg-version-String
...
pkg: version: add String method
2015-12-17 16:58:41 +01:00
Tibor Vass
b0d9476153
builder: remove daemon dependency in ContainerAttach
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-17 16:57:08 +01:00
Tibor Vass
03a170c48d
builder: remove daemon dependency in ContainerCreate()
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-17 16:57:08 +01:00
Sebastiaan van Stijn
742fd4fa63
Merge pull request #18739 from wenchma/typo
...
Fix typo error and update index
2015-12-17 15:43:14 +01:00
Antonio Murdaca
98be580794
Merge pull request #18590 from aaronlehmann/limit-v1-fallbacks
...
Limit v1 protocol fallbacks
2015-12-17 14:44:05 +01:00
Sebastiaan van Stijn
3f4dc49210
Merge pull request #18743 from wenchma/plugin_not_found
...
Sync the docker network create api docs with the error code
2015-12-17 12:16:23 +01:00
Antonio Murdaca
0d9f1e344a
pkg: version: add String method
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-17 11:52:23 +01:00
Sebastiaan van Stijn
5baa93c04e
Merge pull request #18662 from runcom/pkg-authZ-response
...
pkg: authorization: add Err to tweak response status code
2015-12-17 11:12:27 +01:00
Antonio Murdaca
46e3a249a1
pkg: authorization: add Err to tweak response status code
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-17 11:08:47 +01:00
Antonio Murdaca
1d2b62ceae
pkg: plugins: remove dead code
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-17 11:05:50 +01:00
Wen Cheng Ma
597835e645
Sync the docker network create api docs with the error code
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-17 17:48:50 +08:00
Vincent Demeester
0f749ad55a
Merge pull request #18559 from ahmetalpbalkan/return-container-networks
...
Proposal: Add container networks list to /containers/json
2015-12-17 10:11:18 +01:00
Vincent Demeester
cf0acc8eb9
Merge pull request #18622 from runcom/return-err
...
layer: layer_store.go: return on error
2015-12-17 09:10:09 +01:00
Zhang Wei
aaf65a47a7
Better debug message for post form data
...
Print json format instead of default `%q`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-12-17 15:55:39 +08:00
Wen Cheng Ma
e0db2fa4da
Fix typo error and update index
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-17 15:40:10 +08:00
Aaron Lehmann
891bbc17ec
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>
2015-12-16 15:02:24 -08:00
Aaron Lehmann
a57478d65f
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>
2015-12-16 15:02:03 -08:00
David Calavera
905f3336b2
Merge pull request #15964 from duglin/APIVersion
...
Add a DOCKER_API_VERSION env var
2015-12-16 14:23:47 -08:00
David Calavera
cd1ace316d
Merge pull request #18671 from saturnism/patch-1
...
Updated REX-Ray plugin platform support.
2015-12-16 14:16:12 -08:00