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
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
ebb1d56ecb
Merge pull request #18705 from runcom/cleanups
...
Cleanups
2015-12-16 12:40:31 -05:00
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
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
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
89ab39b050
Remove Mount/Unmount from Builder interface.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2015-12-16 09:11:57 -08:00
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
6f930a2ffa
Merge pull request #18700 from mqliang/patch-2
...
Update dockernetworks.md
2015-12-16 16:58:25 +01:00
39fea54b2b
Merge pull request #18696 from mqliang/patch-1
...
fix typo in dockerlinks.md
2015-12-16 16:53:46 +01:00
baba1a8493
reorder imports with goimports
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-16 16:50:25 +01:00
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
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
8435ea5289
pkg: authorization: cleanup
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-16 12:01:04 +01:00
38f409d283
api: client: lib: fix go vet
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-16 12:00:48 +01:00
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
f480b7c1f5
Update dockernetworks.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-16 15:25:06 +08:00
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
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
61a94411b5
Merge pull request #18689 from jfrazelle/fix-vendor-helpers
...
cleanup hack/.vendor-helpers.sh
2015-12-15 16:48:45 -08:00
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
7ddf4214a6
remove oracle linux 6 for time being
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-15 16:34:41 -08:00
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
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
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
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
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
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
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
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
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
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
7bb30e0aeb
Merge pull request #18676 from dnephin/more_registry_types_to_api
...
Move registry.SearchResult types to api/types/registry
2015-12-15 12:00:24 -08:00
27220ecc6b
Move timeutils functions to the only places where they are used.
...
- Move time json marshaling to the jsonlog package: this is a docker
internal hack that we should not promote as a library.
- Move Timestamp encoding/decoding functions to the API types: This is
only used there. It could be a standalone library but I don't this
it's worth having a separated repo for this. It could introduce more
complexity than it solves.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-15 14:56:14 -05:00
efb763aa10
Add note to volume docs that data is not copied to mounted volumes
...
Signed-off-by: Candid Dauth <cdauth@cdauth.eu>
2015-12-15 20:27:35 +01:00
0faee5896d
Remove unecessary chown on mqueue device path
...
This was causing the host /dev/mqueue to be remapped to the daemon's
user namespace range root user and group. Given the perms are open on
the mqueue path, there is no need to chown this path at all.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-12-15 14:11:03 -05:00
e226383614
Move the TestEncodeAuth test to the correct package.
...
Also make EncodeAuth and DecodeAuth private because they're only used by cliconfig.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-15 13:36:52 -05:00
2180dd6cf0
Merge pull request #18617 from tiborvass/cleanup-builder
...
Cleanup builder: remove container package dependency
2015-12-15 09:59:29 -08:00
ce0b1841c8
Merge pull request #17034 from rhvgoyal/volume-propagation
...
Capability to specify per volume mount propagation mode
2015-12-15 12:14:41 -05:00
42ea7a8a93
Merge pull request #18097 from btorresgil/kali-linux-2.0-installer
...
Add support for installation on Kali Linux 2.0
2015-12-15 08:52:53 -08:00
adf1ffd53b
Merge pull request #18416 from toli/disable-official-repo-check-in-push
...
Removing the restriction to push to an 'official' repo
2015-12-15 08:52:36 -08:00
4133dc2212
pkg: plugins: fix and better handle errors
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-15 17:51:48 +01:00
812a7c204a
Merge pull request #18531 from coolljt0725/update_container_networking_on_create
...
fix docker inspect return unconsistent network settings of created container and stopped container
2015-12-15 08:47:54 -08:00
c4472b389d
Move registry.SearchResult types to api/types/registry.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-15 11:44:20 -05:00
93c0de2af4
builder: remove unused Retain/Release and put Mount/Unmount back
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-15 17:24:07 +01:00
c70f8b3c9c
builder: remove container package dependency
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-15 17:24:07 +01:00
2a2d1f57b5
dockerfile: get rid of Commit and CommitConfig
...
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 400e4922cbd004b93774fc55005f74bd8a995242)
2015-12-15 17:23:40 +01:00
22023e05a3
Updated REX-Ray plugin platform support.
...
REX-Ray added Google Compute Engine support: https://github.com/emccode/rexray/issues/113
Signed-off-by: Ray Tsang <rayt@google.com>
2015-12-15 11:21:19 -05:00
06ce22c6e6
Merge pull request #18669 from mqliang/patch-1
...
fixed typo
2015-12-15 16:06:58 +01:00
4c1243dc76
fixed typo
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-15 23:00:47 +08:00
Jessica Frazelle
David Calavera
Brian Goff
Anusha Ragunathan
Christy Perez
Sebastiaan van Stijn
Antonio Murdaca
Doug Davis
Antonio Murdaca
Liang Mingqiang
Daniel Nephin
Jess Frazelle
Alexander Morozov
Morgan Bauer
Candid Dauth
Phil Estes
Tianon Gravi
Tibor Vass
Ray Tsang