Antonio Murdaca
fa7d676891
.gitignore: do not ignore *.rej
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-18 17:12:54 +01: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
47060efdb7
Merge pull request #18741 from WeiZhang555/debug-info
...
Better debug message for post form data
2015-12-18 16:06:07 +01: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
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
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
Tibor Vass
dc81c25031
Merge pull request #18586 from tonistiigi/tag-reference-squashed
...
Improve reference validation
2015-12-16 23:08:02 +01:00
David Calavera
e21d06a972
Merge pull request #18717 from anusha-ragunathan/rm-mount-bld-iface
...
Remove Mount/Unmount from Builder interface.
2015-12-16 13:34:06 -08:00
Brian Goff
3805c29099
Merge pull request #18695 from dnephin/move_parse_link
...
Move ParseLink and validators into runconfig.parse where they are used
2015-12-16 16:15:52 -05:00
Tonis Tiigi
eeb2d4c1ad
Clean up reference type switches
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-16 11:58:53 -08:00
Tonis Tiigi
15d84a3a48
Improve reference parse errors
...
Fixes #18093
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-16 11:58:53 -08:00
Tonis Tiigi
c1040b222c
Remove unused repoinfo
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-16 11:58:52 -08:00
Tonis Tiigi
ffded61dad
Update Named reference with validation of conversions
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-16 11:58:52 -08:00
Tonis Tiigi
2655954c2d
Add own reference package wrapper
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-16 11:58:52 -08:00
Vincent Demeester
cf7ccaf370
Merge pull request #18722 from calavera/remove_unused_packages
...
Remove timeoutconn package, it's not used anywhere
2015-12-16 20:56:43 +01:00
Vincent Demeester
8ec00e6d0e
Merge pull request #18518 from MHBauer/spurious-timing
...
adjust test sleep timing to avoid spurious failure
2015-12-16 20:45:55 +01:00
Alexander Morozov
f8140332c0
Merge pull request #18719 from jfrazelle/vendor-updates
...
update and run vendor script
2015-12-16 11:27:02 -08:00
Vincent Batts
f57d56350e
Merge pull request #18686 from cpuguy83/fix_btrfs_subvol_delete_panic
...
Fix btrfs recursive btrfs subvol delete
2015-12-16 14:26:40 -05:00
Daniel Nephin
233a4fc33c
Move ParseLink and validators into runconfig.parse where they are used.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-16 14:22:54 -05:00
David Calavera
4d8ce0ef4a
Remove timeoutconn package.
...
It's not used anywhere.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-16 13:51:56 -05:00
David Calavera
b44b5bbc8b
Merge pull request #18682 from calavera/replace_units_package
...
Replace pkg/units with docker/go-units.
2015-12-16 10:48:59 -08:00
Antonio Murdaca
c2276c1fe3
Merge pull request #18693 from dnephin/move_parse_docker_host
...
Move ParseDockerDaemonHost to opts/ package
2015-12-16 19:05:07 +01:00
Jessica Frazelle
a016ec6fd1
update and run vendor script
...
so there was weird whitespacing that got messed up the last time this was run, this fixes that and cleans up vendor helpers as well :)
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-16 09:58:20 -08:00
David Calavera
64377e3466
Merge pull request #18694 from duglin/BetterError
...
Add the filename to the error message while trying to parse the config file
2015-12-16 09:49:06 -08:00
Brian Goff
ebb1d56ecb
Merge pull request #18705 from runcom/cleanups
...
Cleanups
2015-12-16 12:40:31 -05:00
David Calavera
4fef42ba20
Replace pkg/units with docker/go-units.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-16 12:26:49 -05:00
David Calavera
0609342d04
Vendor go-units and libcontainer.
...
Libcontainer depends on the new package now to avoid cycled
dependencies.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-16 12:25:54 -05:00
Brian Goff
8f2a15b880
Merge pull request #18703 from runcom/nit-plugins-volume
...
docs: extend: plugins_volume.md: Err default to empty string
2015-12-16 12:23:34 -05:00
Anusha Ragunathan
89ab39b050
Remove Mount/Unmount from Builder interface.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2015-12-16 09:11:57 -08:00
Christy Perez
2236ecddfb
Update TestRunWithBlkioInvalidDevice Tests
...
/dev/sda wasn't an invalid device and this test failed, so, hopefully
/dev/sdX isn't going to exist in other envs.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2015-12-16 10:58:31 -06:00