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
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
Sebastiaan van Stijn
6f930a2ffa
Merge pull request #18700 from mqliang/patch-2
...
Update dockernetworks.md
2015-12-16 16:58:25 +01:00
Sebastiaan van Stijn
39fea54b2b
Merge pull request #18696 from mqliang/patch-1
...
fix typo in dockerlinks.md
2015-12-16 16:53:46 +01:00
Antonio Murdaca
baba1a8493
reorder imports with goimports
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-16 16:50:25 +01:00
Doug Davis
b0a18d57a7
Add the filename to the error message while trying to parse the config file
...
Notice this while looking at #18634 . W/o this extra text we're not sure if
its complaining about the old or new config file.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-12-16 05:34:06 -08:00
Antonio Murdaca
bb2c92355c
Merge pull request #18655 from dmcgowan/fix-docker-inspect-container
...
Add metadata function to layer store
2015-12-16 12:23:41 +01:00
Antonio Murdaca
8435ea5289
pkg: authorization: cleanup
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-16 12:01:04 +01:00
Antonio Murdaca
38f409d283
api: client: lib: fix go vet
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-16 12:00:48 +01:00
Antonio Murdaca
cc62a88524
docs: extend: plugins_volume.md: Err default to empty string
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-16 09:52:26 +01:00
Liang Mingqiang
f480b7c1f5
Update dockernetworks.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-16 15:25:06 +08:00
Liang Mingqiang
e1f012cf39
fix typo in dockerlinks.md
...
fix typo in dockerlinks.md
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-16 11:21:39 +08:00
Daniel Nephin
9b99591054
Move ParseDockerDaemonHost to opts/ package.
...
This function was only being used from a single place opts/opts.go. This
change moves it from a incohesive package (parsers) to the single place it
is used.
Also made a bunch of the helper methods private because they are not used
by any external modules.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-15 20:53:17 -05:00
Jess Frazelle
61a94411b5
Merge pull request #18689 from jfrazelle/fix-vendor-helpers
...
cleanup hack/.vendor-helpers.sh
2015-12-15 16:48:45 -08:00
Alexander Morozov
731433a55b
Merge pull request #18691 from jfrazelle/remove-oraclelinux-6
...
remove oracle linux 6 for time being
2015-12-15 16:42:31 -08:00
Jessica Frazelle
7ddf4214a6
remove oracle linux 6 for time being
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-15 16:34:41 -08:00
Alexander Morozov
803c7626ca
Merge pull request #18687 from calavera/move_filters_to_api
...
Move filters package to the API.
2015-12-15 16:25:27 -08:00
Jessica Frazelle
6636aec38a
cleanup hack/.vendor-helpers.sh
...
seccomp is already in $dockerBuildTags
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-15 15:50:10 -08:00
David Calavera
e98cae4919
Move filters package to the API.
...
These filters are only use to interchange data between clients and daemons.
They don't belong to the parsers package.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-15 18:13:26 -05:00
Brian Goff
f9befce2d3
Fix btrfs recursive btrfs subvol delete
...
Really fixing 2 things:
1. Panic when any error is detected while walking the btrfs graph dir on
removal due to no error check.
2. Nested subvolumes weren't actually being removed due to passing in
the wrong path
On point 2, for a path detected as a nested subvolume, we were calling
`subvolDelete("/path/to/subvol", "subvol")`, where the last part of the
path was duplicated due to a logic error, and as such actually causing
point #1 since `subvolDelete` joins the two arguemtns, and
`/path/to/subvol/subvol` (the joined version) doesn't exist.
Also adds a test for nested subvol delete.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-12-15 18:12:40 -05:00
David Calavera
52fd30079a
Merge pull request #18685 from calavera/remove_timeutils
...
Move timeutils functions to the only places where they are used.
2015-12-15 15:11:18 -08:00
David Calavera
d3fbd43432
Merge pull request #18677 from runcom/fix-plugins-error
...
pkg: plugins: fix and better handle errors
2015-12-15 14:17:52 -08:00
Morgan Bauer
81c334fa56
adjust test sleep timing to avoid spurious failure
...
- refactor ConsumeWithSpeed
- documentation
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-12-15 13:27:24 -08:00
David Calavera
b0f652fc38
Merge pull request #18648 from jfrazelle/fix-install-script-trusty
...
fix install script for ubuntu trusty
2015-12-15 12:55:01 -08:00
Alexander Morozov
33abc6f8af
Merge pull request #18683 from estesp/no-dev-symlink-chown
...
Remove unecessary chown on mqueue device path
2015-12-15 12:47:03 -08:00
David Calavera
c0c5c00337
Merge pull request #18681 from dnephin/move_cliconfig_test
...
Move the TestEncodeAuth test to the correct package
2015-12-15 12:42:38 -08:00