e98aacbdae
Merge pull request #18705 from runcom/cleanups
...
Cleanups
Upstream-commit: ebb1d56ecb21ff9833159a52766561bb82be285b
Component: engine
2015-12-16 12:40:31 -05:00
c819e8f023
Merge pull request #18703 from runcom/nit-plugins-volume
...
docs: extend: plugins_volume.md: Err default to empty string
Upstream-commit: 8f2a15b88096b3196356240eac5704a17949a9ea
Component: engine
2015-12-16 12:23:34 -05:00
a99a73ad6e
Merge pull request #18700 from mqliang/patch-2
...
Update dockernetworks.md
Upstream-commit: 6f930a2ffa57b022947743d6f16751a27b93fbed
Component: engine
2015-12-16 16:58:25 +01:00
b658fdbb95
Merge pull request #18696 from mqliang/patch-1
...
fix typo in dockerlinks.md
Upstream-commit: 39fea54b2bf99dccd7fb2cc6a3835242b7ab731c
Component: engine
2015-12-16 16:53:46 +01:00
91750ca308
reorder imports with goimports
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: baba1a84935bd2114d48f1f4823ee9c379d62e68
Component: engine
2015-12-16 16:50:25 +01:00
51d333deab
Merge pull request #18655 from dmcgowan/fix-docker-inspect-container
...
Add metadata function to layer store
Upstream-commit: bb2c92355cb6f4e6935a945c22989fd3afe8e3cb
Component: engine
2015-12-16 12:23:41 +01:00
b790e177cc
pkg: authorization: cleanup
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 8435ea52893ef69c5a264bfbf0a1d3472f377ba2
Component: engine
2015-12-16 12:01:04 +01:00
900008a6f2
api: client: lib: fix go vet
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 38f409d283c9ec328f25a3646bf6605beb897e0d
Component: engine
2015-12-16 12:00:48 +01:00
fb506b92c1
docs: extend: plugins_volume.md: Err default to empty string
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: cc62a88524b623c8f86075d9ed220196cf5e92da
Component: engine
2015-12-16 09:52:26 +01:00
b6343dc716
Update dockernetworks.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: f480b7c1f576f033ee276a026a790de415b9bf9c
Component: engine
2015-12-16 15:25:06 +08:00
86c606852c
fix typo in dockerlinks.md
...
fix typo in dockerlinks.md
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: e1f012cf397f170e12443e4993c09171791d37db
Component: engine
2015-12-16 11:21:39 +08:00
4e879d86c0
Merge pull request #18689 from jfrazelle/fix-vendor-helpers
...
cleanup hack/.vendor-helpers.sh
Upstream-commit: 61a94411b5b4c8527c8844ed58d74f9c52601b92
Component: engine
2015-12-15 16:48:45 -08:00
77ce2d3289
remove oracle linux 6 for time being
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 7ddf4214a666c3182acc031cec02fc99c877e98b
Component: engine
2015-12-15 16:34:41 -08:00
d75ce7e929
cleanup hack/.vendor-helpers.sh
...
seccomp is already in $dockerBuildTags
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6636aec38a6cb93cab2924dc94acd5615f4ccab8
Component: engine
2015-12-15 15:50:10 -08:00
b1147e3d7d
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 >
Upstream-commit: e98cae4919da69dc6f9ae46527792cf2012cc7f2
Component: engine
2015-12-15 18:13:26 -05:00
7cc80752fd
Merge pull request #18685 from calavera/remove_timeutils
...
Move timeutils functions to the only places where they are used.
Upstream-commit: 52fd30079a8f9a56402d4c4f1666c96bd9af98da
Component: engine
2015-12-15 15:11:18 -08:00
cbdc74599e
Merge pull request #18677 from runcom/fix-plugins-error
...
pkg: plugins: fix and better handle errors
Upstream-commit: d3fbd434327e8081de318646bc44d3973814965b
Component: engine
2015-12-15 14:17:52 -08:00
17c0082e32
Merge pull request #18648 from jfrazelle/fix-install-script-trusty
...
fix install script for ubuntu trusty
Upstream-commit: b0f652fc3892ed85673c79587807a8b9cb6256a4
Component: engine
2015-12-15 12:55:01 -08:00
88b341f00a
Merge pull request #18683 from estesp/no-dev-symlink-chown
...
Remove unecessary chown on mqueue device path
Upstream-commit: 33abc6f8af0fce5bd3923a3e8a1f5748f282ec92
Component: engine
2015-12-15 12:47:03 -08:00
abbe1c5ae0
Merge pull request #18681 from dnephin/move_cliconfig_test
...
Move the TestEncodeAuth test to the correct package
Upstream-commit: c0c5c00337e8858dccf7f30e3b8997b04eed0dfc
Component: engine
2015-12-15 12:42:38 -08:00
bb4c66ef5c
Merge pull request #18676 from dnephin/more_registry_types_to_api
...
Move registry.SearchResult types to api/types/registry
Upstream-commit: 7bb30e0aeb19b5d724a68eefacf0495abd7a874f
Component: engine
2015-12-15 12:00:24 -08:00
7f43cd332d
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 >
Upstream-commit: 27220ecc6b1eedf650ca9cf94965cb0dc2054efd
Component: engine
2015-12-15 14:56:14 -05:00
dbdbe73612
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)
Upstream-commit: 0faee5896d5cd389cb022f6cea050bbf1bfd9443
Component: engine
2015-12-15 14:11:03 -05:00
6422979f2c
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 >
Upstream-commit: e2263836141e9d6daa03765a3f4c5ccf39a429b9
Component: engine
2015-12-15 13:36:52 -05:00
ff4354d4e6
Merge pull request #18617 from tiborvass/cleanup-builder
...
Cleanup builder: remove container package dependency
Upstream-commit: 2180dd6cf0258dee45a11ce6bf597448b8157984
Component: engine
2015-12-15 09:59:29 -08:00
2a2006ef18
Merge pull request #17034 from rhvgoyal/volume-propagation
...
Capability to specify per volume mount propagation mode
Upstream-commit: ce0b1841c82b6972d96654e083f813944e72443f
Component: engine
2015-12-15 12:14:41 -05:00
26cf52e1eb
Merge pull request #18097 from btorresgil/kali-linux-2.0-installer
...
Add support for installation on Kali Linux 2.0
Upstream-commit: 42ea7a8a93c15e77904e4324b77aa86cc0cab29d
Component: engine
2015-12-15 08:52:53 -08:00
eb815212b6
Merge pull request #18416 from toli/disable-official-repo-check-in-push
...
Removing the restriction to push to an 'official' repo
Upstream-commit: adf1ffd53b070443fd0f544c568e6c53d373caeb
Component: engine
2015-12-15 08:52:36 -08:00
dcc0a93ee4
pkg: plugins: fix and better handle errors
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 4133dc22122c6a032276adb073d651bc6aca181b
Component: engine
2015-12-15 17:51:48 +01:00
61bb408463
Merge pull request #18531 from coolljt0725/update_container_networking_on_create
...
fix docker inspect return unconsistent network settings of created container and stopped container
Upstream-commit: 812a7c204a2396700ca1e95d949659b16302a120
Component: engine
2015-12-15 08:47:54 -08:00
c85ff1af0e
Move registry.SearchResult types to api/types/registry.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c4472b389dae8e86c8d98872fcbfe0c63d1e15a1
Component: engine
2015-12-15 11:44:20 -05:00
0bf29d425d
builder: remove unused Retain/Release and put Mount/Unmount back
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 93c0de2af4f88f68b793a282cb654a14bd32eb3f
Component: engine
2015-12-15 17:24:07 +01:00
bf2423fe8a
builder: remove container package dependency
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: c70f8b3c9c7a6dc6a219354acaa2e650d1403ecf
Component: engine
2015-12-15 17:24:07 +01:00
637e991bae
dockerfile: get rid of Commit and CommitConfig
...
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit 400e4922cbd004b93774fc55005f74bd8a995242)
Upstream-commit: 2a2d1f57b586632a5304f1093add28ef64661902
Component: engine
2015-12-15 17:23:40 +01:00
34e0c13d67
fixed typo
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 4c1243dc76ad4afa6cfa6eec3070073ba0cb0c6a
Component: engine
2015-12-15 23:00:47 +08:00
f17065a779
Merge pull request #18664 from mqliang/patch-1
...
fix typo in runmetrics.md
Upstream-commit: effdb3b7635a832be1db9704a0264096c25130f1
Component: engine
2015-12-15 13:13:36 +01:00
9d4285ed4b
Merge pull request #18661 from zhanghuanzhong/docker-fix-a-confused-variable
...
The logName is confused here, it's a localName actually.
Upstream-commit: 7fe5631b5e043a5b1ab0b666422e6132ca60a2ce
Component: engine
2015-12-15 12:32:52 +01:00
0346aecb49
Merge pull request #18606 from runcom/dmwtf
...
devmapper: store base device fs type
Upstream-commit: b32713bed18a185ee05275bf252221f7d039c180
Component: engine
2015-12-15 12:22:15 +01:00
0b8410bce0
fix typo in runmetrics.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 941bbd57ac26d77ecf651b8e418c6ed8f08b39bd
Component: engine
2015-12-15 19:14:47 +08:00
9d8787d53c
Merge pull request #18536 from WeiZhang555/daemon-err
...
Better error message for invalid unix socket format
Upstream-commit: 98d97743d2ef40156a28f82381d60a0635a1aff8
Component: engine
2015-12-15 11:51:47 +01:00
bc2d1566f2
devmapper: store base device fs type
...
After the very first init of the graph `docker info` correctly shows the
base fs type under `Backing Filesystem`. This information isn't stored
anywhere. After a restart (w/o erasing `/var/lib/docker`) `docker info`
shows an empty string under `Backing Filesystem`.
This patch records the base fs type after the first run in the metadata
or, to fix old devices that don't have this info in the metadata, just
probe the fs type of the base device at graph startup.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: f22ee02c6d6bd16f2179e71366ec641a7d234e96
Component: engine
2015-12-15 09:33:19 +01:00
909e4fb76a
Merge pull request #18659 from Mashimiao/blkio-bps-tfix
...
tfix: modify internal variable name to be lower-case
Upstream-commit: 6c0c199103a40979340763467d23108553a350a6
Component: engine
2015-12-15 09:20:15 +01:00
b0c418d17a
The logName is confused here, it's a localName actually.
...
Signed-off-by: huanzhong zhang <zhanghuanzhong90@gmail.com >
Upstream-commit: badfc7e10fdc96d32190806df80b11f2fc41db13
Component: engine
2015-12-15 15:21:28 +08:00
852bc2ea6c
Merge pull request #18638 from cdituri/16667-devmapper-common-message-prefix
...
Make all the devmapper log messages consistent with a common prefix.
Upstream-commit: a398536d5e001efe06c329cdea3c33a075db8594
Component: engine
2015-12-15 00:08:00 -05:00
1902774c3d
Merge pull request #18650 from calavera/remove_httputils_dep_from_api
...
Remove httputils dependency from API client lib.
Upstream-commit: 2ec34dca050f839480e6b2f0c8b892e0a73a0d16
Component: engine
2015-12-14 20:51:53 -08:00
ba9d0503c4
Make pkg/devicemapper/ log messages with a common, consistent prefix.
...
Closes #16667
Uses the prefix "devicemapper:" for all the fmt and logrus error, debug, and info messages.
Signed-off-by: Chris Dituri <csdituri@gmail.com >
Upstream-commit: 9b584781ad9c810bc9060448f391a3ae6a7d7cbb
Component: engine
2015-12-14 21:35:15 -06:00
f1d7c7a10b
Make daemon/graphdriver/devmapper log messages with a common, consistent prefix.
...
Closes #16667
Uses the prefix "devmapper:" for all the fmt and logrus error, debug, and info messages.
Signed-off-by: Chris Dituri <csdituri@gmail.com >
Upstream-commit: 0aa6ace6e6e819551d21ebdcaa0c5802f76d7603
Component: engine
2015-12-14 21:35:13 -06:00
ed5505c1c9
Better error message for invalid unix socket format
...
Give more meaningful error prompts when user try to bind a directory as
unix socket.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 20012e423c865d12889af89f41459d30e7fe7901
Component: engine
2015-12-15 10:05:58 +08:00
49f615806b
tfix: modify internal variable name to be lower-case
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 38797ca61b6d88fe71615108897b1f7d1767f449
Component: engine
2015-12-15 09:50:16 +08:00
914e2c1f2d
Add metadata function to layer store
...
Add function to get metadata from layer store for a mutable layer
fixes #18614
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: a7e096832123280d26df3c121ecad8dd012060b9
Component: engine
2015-12-14 16:52:15 -08:00
