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
c170e97197
Explain 'json' function a bit better
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-12-15 13:41:47 +00:00
effdb3b763
Merge pull request #18664 from mqliang/patch-1
...
fix typo in runmetrics.md
2015-12-15 13:13:36 +01:00
7fe5631b5e
Merge pull request #18661 from zhanghuanzhong/docker-fix-a-confused-variable
...
The logName is confused here, it's a localName actually.
2015-12-15 12:32:52 +01:00
b32713bed1
Merge pull request #18606 from runcom/dmwtf
...
devmapper: store base device fs type
2015-12-15 12:22:15 +01:00
941bbd57ac
fix typo in runmetrics.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-15 19:14:47 +08:00
98d97743d2
Merge pull request #18536 from WeiZhang555/daemon-err
...
Better error message for invalid unix socket format
2015-12-15 11:51:47 +01:00
f22ee02c6d
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>
2015-12-15 09:33:19 +01:00
6c0c199103
Merge pull request #18659 from Mashimiao/blkio-bps-tfix
...
tfix: modify internal variable name to be lower-case
2015-12-15 09:20:15 +01:00
badfc7e10f
The logName is confused here, it's a localName actually.
...
Signed-off-by: huanzhong zhang <zhanghuanzhong90@gmail.com>
2015-12-15 15:21:28 +08:00
a398536d5e
Merge pull request #18638 from cdituri/16667-devmapper-common-message-prefix
...
Make all the devmapper log messages consistent with a common prefix.
2015-12-15 00:08:00 -05:00
2ec34dca05
Merge pull request #18650 from calavera/remove_httputils_dep_from_api
...
Remove httputils dependency from API client lib.
2015-12-14 20:51:53 -08:00
9b584781ad
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>
2015-12-14 21:35:15 -06:00
0aa6ace6e6
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>
2015-12-14 21:35:13 -06:00
755f8609f6
Add containers’ networks to /containers/json
...
After addition of multi-host networking in Docker 1.9, Docker Remote
API is still returning only the network specified during creation
of the container in the “List Containers” (`/containers/json`) endpoint:
...
"HostConfig": {
"NetworkMode": "default"
},
The list of networks containers are attached to is only available at
Get Container (`/containers/<id>/json`) endpoint.
This does not allow applications utilizing multi-host networking to
be built on top of Docker Remote API.
Therefore I added a simple `"NetworkSettings"` section to the
`/containers/json` endpoint. This is not identical to the NetworkSettings
returned in Get Container (`/containers/<id>/json`) endpoint. It only
contains a single field `"Networks"`, which is essentially the same
value shown in inspect output of a container.
This change adds the following section to the `/containers/json`:
"NetworkSettings": {
"Networks": {
"bridge": {
"EndpointID": "2cdc4edb1ded3631c81f57966563e...",
"Gateway": "172.17.0.1",
"IPAddress": "172.17.0.2",
"IPPrefixLen": 16,
"IPv6Gateway": "",
"GlobalIPv6Address": "",
"GlobalIPv6PrefixLen": 0,
"MacAddress": "02:42:ac:11:00:02"
}
}
}
This is of type `SummaryNetworkSettings` type, a minimal version of
`api/types#NetworkSettings`.
Actually all I need is the network name and the IPAddress fields. If folks
find this addition too big, I can create a `SummaryEndpointSettings` field
as well, containing just the IPAddress field.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-12-14 19:03:23 -08:00
20012e423c
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>
2015-12-15 10:05:58 +08:00
38797ca61b
tfix: modify internal variable name to be lower-case
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-15 09:50:16 +08:00
a7e0968321
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)
2015-12-14 16:52:15 -08:00
f408b4f463
Adapt container settings when start
...
`adaptContainerSettings` is growing up, new it's only called
when create. It'll be a problem that old containers will never
have chance to adapt the latest rule. `HostConfig` of these
containers will be obsoleted.
Add this calling to start to avoid problems like #18550 and
avoid such backward compatability in the future.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-15 08:42:26 +08:00
8970337f60
Merge pull request #18649 from albers/completion-daemon--authz-plugin
...
bash completion for `docker daemon --authz-plugin`
2015-12-14 23:13:21 +01:00
87740d001c
Merge pull request #18644 from calavera/remove_timeout_func_dependency_from_api_lib
...
Remove timeout shared function.
2015-12-14 23:05:29 +01:00
a7e30a4ffb
Merge pull request #18643 from tianon/apt-get-clean
...
Remove mention of "apt-get clean" as it's performed automatically
2015-12-14 22:54:17 +01:00
83b5729f64
Remove httputils dependency from API client lib.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-14 16:48:59 -05:00
260cbb19c9
Merge pull request #18486 from aboch/vnd
...
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
2015-12-14 13:32:01 -08:00
069fe81fa6
bash completion for `docker daemon --authz-plugin`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-14 13:25:45 -08:00
bdde4b32a1
fix install script for ubuntu trusty
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-14 13:13:39 -08:00
ecc3717cb1
Merge pull request #18612 from mrunalp/update_runc
...
Update runc/libcontainer to v0.0.6
2015-12-14 13:05:53 -08:00
226329e540
Remove mention of "apt-get clean" as it's performed automatically
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-12-14 12:50:44 -08:00
6e85d30f1b
Merge pull request #18645 from sdurrheimer/zsh-completion-daemon-authz-plugin
...
Zsh completion daemon authz plugin
2015-12-14 12:50:14 -08:00
6287ec9095
Add a DOCKER_API_VERSION env var
...
Closes : #11486
Just for @ahmetalpbalkan :-)
Fixed some comment formatting too while in there.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-12-14 12:45:34 -08:00
4ba173630a
Fix small missing equal sign for 'docker daemon --cluster-store-opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-12-14 21:20:49 +01:00
76844d786b
Add zsh completion for 'docker daemon --authz-plugin'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-12-14 21:16:54 +01:00
75d69ce0da
Merge pull request #18637 from dnephin/move_auth_config
...
Move more api types to api/types package
2015-12-14 11:53:30 -08:00
0c2dd27581
Merge pull request #18642 from tophj-ibm/add-z-unshare-image
...
Add unshare image to s390x Dockerfile
2015-12-14 11:32:27 -08:00
9dc7d07fc1
Remove timeout shared function.
...
Handle timeouts when it's necessary based on a Timeout interface.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-14 14:24:21 -05:00
984282e28c
Merge pull request #18639 from calavera/force_api_version
...
Force API versioning in the client library.
2015-12-14 11:20:12 -08:00
03e2923e42
Merge pull request #18570 from suihkulokki/control-fix
...
hack/make/.build-deb/control: add missing fields
2015-12-14 10:41:56 -08:00
b13fd10109
Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen
...
Windows CI Fix: No subshell due to bash 3.x
2015-12-14 10:32:53 -08:00
52e53814ea
Add unshare image to s390x Dockerfile
...
This adds unshare image to Dockerfile.s390x
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-12-14 12:16:18 -06:00
c38aa60180
Merge pull request #18393 from qzio/apparmor/ptrace-ubuntu14
...
Enable ptrace in a container on apparmor below 2.9
2015-12-14 10:07:01 -08:00
Tianon Gravi
Jess Frazelle
Antonio Murdaca
Alexander Morozov
Daniel Nephin
Tibor Vass
Ray Tsang
Sebastiaan van Stijn
Liang Mingqiang
Bryan Boreham
Vincent Demeester
huanzhong zhang
Phil Estes
Arnaud Porterie
Chris Dituri
Ahmet Alp Balkan
Zhang Wei
Ma Shimiao
Derek McGowan
Qiang Huang
David Calavera
Harald Albers
Jessica Frazelle
Doug Davis
Steve Durrheimer
Christopher Jones