Commit Graph
20732 Commits
Author SHA1 Message Date
Tibor Vass 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
Ray Tsang 6cfc285ba0 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>
Upstream-commit: 22023e05a319c60af2bc2c2f30ade8fa1f6f33fe
Component: engine
2015-12-15 11:21:19 -05:00
Sebastiaan van Stijn cf6e66f989 Merge pull request #18669 from mqliang/patch-1
fixed typo
Upstream-commit: 06ce22c6e6ceecbc03084399274ab1b2d5d6088e
Component: engine
2015-12-15 16:06:58 +01:00
Liang Mingqiang 34e0c13d67 fixed typo
Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: 4c1243dc76ad4afa6cfa6eec3070073ba0cb0c6a
Component: engine
2015-12-15 23:00:47 +08:00
Sebastiaan van Stijn 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
Vincent Demeester 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
Vincent Demeester 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
Liang Mingqiang 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
Sebastiaan van Stijn 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
Antonio Murdaca 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
Vincent Demeester 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
huanzhong zhang 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
Phil Estes 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
Arnaud Porterie 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
Chris Dituri 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
Chris Dituri 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
Ahmet Alp Balkan b07ebd0f2f 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>
Upstream-commit: 755f8609f699a20cb47ec7269e3a9469541a9419
Component: engine
2015-12-14 19:03:23 -08:00
Zhang Wei 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
Ma Shimiao 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
Derek McGowan 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
Qiang Huang 44843b860e 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>
Upstream-commit: f408b4f4639b7c987c93b26174fccfcc513519e4
Component: engine
2015-12-15 08:42:26 +08:00
Sebastiaan van Stijn e85bbba160 Merge pull request #18649 from albers/completion-daemon--authz-plugin
bash completion for `docker daemon --authz-plugin`
Upstream-commit: 8970337f609d38dab69785f963d4a64a539ebf1b
Component: engine
2015-12-14 23:13:21 +01:00
Vincent Demeester 1bf96a8c15 Merge pull request #18644 from calavera/remove_timeout_func_dependency_from_api_lib
Remove timeout shared function.
Upstream-commit: 87740d001c5888834496f1612ae80aa95306ff5f
Component: engine
2015-12-14 23:05:29 +01:00
Sebastiaan van Stijn f0d94a9df5 Merge pull request #18643 from tianon/apt-get-clean
Remove mention of "apt-get clean" as it's performed automatically
Upstream-commit: a7e30a4ffba7989362537ebdc78d136fbcab59be
Component: engine
2015-12-14 22:54:17 +01:00
David Calavera e47f560066 Remove httputils dependency from API client lib.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 83b5729f6452de6b40719b9485947eea0bd0eedd
Component: engine
2015-12-14 16:48:59 -05:00
Alexander Morozov 19f8a4f8fb Merge pull request #18486 from aboch/vnd
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Upstream-commit: 260cbb19c93ba1dc5aa0f4065cd5c95241bbd59d
Component: engine
2015-12-14 13:32:01 -08:00
Harald Albers dde4bcd6f4 bash completion for docker daemon --authz-plugin
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 069fe81fa602e7d8af98e2b67b761a62526f014a
Component: engine
2015-12-14 13:25:45 -08:00
Jessica Frazelle 3d2a8bfdec fix install script for ubuntu trusty
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: bdde4b32a1bd1b2c79ac22464ffb78509046fcb4
Component: engine
2015-12-14 13:13:39 -08:00
Alexander Morozov 4b93eb25be Merge pull request #18612 from mrunalp/update_runc
Update runc/libcontainer to v0.0.6
Upstream-commit: ecc3717cb17313186ee711e624b960b096a9334f
Component: engine
2015-12-14 13:05:53 -08:00
Tianon Gravi 899c6bfe77 Remove mention of "apt-get clean" as it's performed automatically
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 226329e54031256958740af0ae5bc1a4f2cd9c2e
Component: engine
2015-12-14 12:50:44 -08:00
David Calavera f838f841da Merge pull request #18645 from sdurrheimer/zsh-completion-daemon-authz-plugin
Zsh completion daemon authz plugin
Upstream-commit: 6e85d30f1b2d7d73502b17fee87a57e16841a56a
Component: engine
2015-12-14 12:50:14 -08:00
Doug Davis 6a842265ad 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>
Upstream-commit: 6287ec9095f380449f0b4f1a06d4e5df43fc4449
Component: engine
2015-12-14 12:45:34 -08:00
Steve Durrheimer a0ef20d025 Fix small missing equal sign for 'docker daemon --cluster-store-opt'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 4ba173630ad2b7a5fc59df280617a1bfa1dda323
Component: engine
2015-12-14 21:20:49 +01:00
Steve Durrheimer 0d312f9927 Add zsh completion for 'docker daemon --authz-plugin'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 76844d786bea2e435d25f150044fa242206ce364
Component: engine
2015-12-14 21:16:54 +01:00
David Calavera 6e0f72dc84 Merge pull request #18637 from dnephin/move_auth_config
Move more api types to api/types package
Upstream-commit: 75d69ce0da2e360773736502acd92d4a9cf7faa5
Component: engine
2015-12-14 11:53:30 -08:00
Jess Frazelle 7890f1c0f3 Merge pull request #18642 from tophj-ibm/add-z-unshare-image
Add unshare image to s390x Dockerfile
Upstream-commit: 0c2dd27581048102b5d8803f95e6bc58834842d7
Component: engine
2015-12-14 11:32:27 -08:00
David Calavera 7e7a8a6ffd Remove timeout shared function.
Handle timeouts when it's necessary based on a Timeout interface.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9dc7d07fc11163205985b7d56742a4f9b89d7e09
Component: engine
2015-12-14 14:24:21 -05:00
David Calavera 884e98d4cc Merge pull request #18639 from calavera/force_api_version
Force API versioning in the client library.
Upstream-commit: 984282e28cf68e658112f199e8baa5f0931cc242
Component: engine
2015-12-14 11:20:12 -08:00
Jess Frazelle 89d947a31f Merge pull request #18570 from suihkulokki/control-fix
hack/make/.build-deb/control: add missing fields
Upstream-commit: 03e2923e42446dbb830c654d0eec323a0b4ef02a
Component: engine
2015-12-14 10:41:56 -08:00
Jess Frazelle df6285237c Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen
Windows CI Fix: No subshell due to bash 3.x
Upstream-commit: b13fd10109db75996a31fd52393ef3410feee3ca
Component: engine
2015-12-14 10:32:53 -08:00
Christopher Jones cc9801b915 Add unshare image to s390x Dockerfile
This adds unshare image to Dockerfile.s390x

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 52e53814ea860919f8ddf2c82a6b24d41630072c
Component: engine
2015-12-14 12:16:18 -06:00
Jess Frazelle 18aa0ef1ba Merge pull request #18393 from qzio/apparmor/ptrace-ubuntu14
Enable ptrace in a container on apparmor below 2.9
Upstream-commit: c38aa60180792210a21f162a57958bda86f9c381
Component: engine
2015-12-14 10:07:01 -08:00
David Calavera a55d187756 Force API versioning in the client library.
Remove dependencies on docker's version packages.
Allow empty version as a fallback to latest version.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: b679eb9a8263d2cb00fecc8741d62d2b35db5ac5
Component: engine
2015-12-14 12:06:42 -05:00
Daniel Nephin 7f5dff04d0 Move IndexInfo and ServiceConfig types to api/types/registry/registry.go
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: 96c10098ac32f700f37358e2adc36c94741772bb
Component: engine
2015-12-14 11:28:02 -05:00
Tibor Vass f21c49a3d1 Merge pull request #18631 from tiborvass/cleanup-utils
Create `builder/dockerignore` and `pkg/gitutils` to clean up `utils`
Upstream-commit: 44299989b24507dad0bcd66fefcbc2a00e13665c
Component: engine
2015-12-14 17:22:01 +01:00
Daniel Nephin 0d867da41c Move AuthConfig to api/types
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: 5b321e328769cc93c3454e82ec3fe07672156f2e
Component: engine
2015-12-14 11:22:01 -05:00
toli c91a6d546b Removing the restriction to push to a 'official' repo
Signed-off-by: toli <toli@docker.com>
Upstream-commit: 0d824c760ec2413f4df7855b9b6559424d01e556
Component: engine
2015-12-14 07:45:00 -08:00
Vivek Goyal a1551674ac Add some unit and integration tests
Add a unit test and couple of integration tests for volume propagation.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: f988c98ff318dcfecb9d2db9511fe78e70b43e44
Component: engine
2015-12-14 10:39:53 -05:00
Vivek Goyal a9fa7f4c75 Check Propagation properties of source mount point
Whether a shared/slave volume propagation will work or not also depends on
where source directory is mounted on and what are the propagation properties
of that mount point. For example, for shared volume mount to work, source
mount point should be shared. For slave volume mount to work, source mount
point should be either shared/slave.

This patch determines the mount point on which directory is mounted and
checks for desired minimum propagation properties of that mount point. It
errors out of configuration does not seem right.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: d4b4ce2588d02acd3602d42b788c6b36ab9b01e5
Component: engine
2015-12-14 10:39:53 -05:00
Vivek Goyal c0860c6bed Add capability to specify mount propagation per volume
Allow passing mount propagation option shared, slave, or private as volume
property.

For example.
docker run -ti -v /root/mnt-source:/root/mnt-dest:slave fedora bash

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: a2dc4f79f260247afe55ab7117c9de02a769d883
Component: engine
2015-12-14 10:39:53 -05:00