Commit Graph

31121 Commits

Author SHA1 Message Date
Alexander Morozov 0e01981fe9 Merge pull request #27932 from thaJeztah/promote-overlay
promote overlay(2) graphdriver
Upstream-commit: 78a83a22699198b31c8cbdace3a73c8502f99ba1
Component: engine
2016-11-02 07:00:49 -07:00
Akihiro Suda 7a2e0e404b Merge pull request #27974 from yongtang/27969-duplicate-bind-mount
Fix issue related to duplicate identical bind mounts for `docker run`
Upstream-commit: e448a32192f85f084652b3f0d96a3e59d4d63035
Component: engine
2016-11-02 20:26:25 +09:00
milindchawre a99c149057 Fixes #21803 : Removing unused configuration in daemon/logger/fluentd
Signed-off-by: milindchawre <milindchawre@gmail.com>
Upstream-commit: 3463bbcc710ce56a8d2ace1e2a2aaaf22db3a516
Component: engine
2016-11-02 11:11:02 +00:00
Vincent Demeester 7051bd85ce Merge pull request #27883 from mavenugo/na
Copy only the relevant endpoint configs from Attachable config
Upstream-commit: ebf10dc5b01dabaa3bcbb75f40683aa0432ec1e2
Component: engine
2016-11-02 11:50:31 +01:00
Muayyad Alsadi 511eee3a2e fixes #17734, clear message for host volumes not starting with /
Signed-off-by: Muayyad Alsadi <alsadi@gmail.com>
Upstream-commit: a8180eeaedfb5161a0e8db8ddd464ac3f1eb5cfb
Component: engine
2016-11-02 12:19:10 +02:00
allencloud 3e5ee94d25 node rm can be applied on not only active node
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 002262d6f5d9d88b690124b3743db6856fe4f599
Component: engine
2016-11-02 17:22:04 +08:00
Vincent Demeester 0e5f9bc87e Merge pull request #27965 from dmcgowan/remove-rw-tar-stream-from
Remove TarStreamFrom from RWLayer interface
Upstream-commit: 6740bc58950ab97da0fe1e60c46514561197c8aa
Component: engine
2016-11-02 10:18:20 +01:00
Vincent Demeester fd88171dba Merge pull request #27705 from dmcgowan/fix-27298
Ensure opaque directory permissions respected
Upstream-commit: bcdce2a6b0d52a18b4eb4a2cb7710b248be88e51
Component: engine
2016-11-02 10:13:30 +01:00
allencloud 1195e5e7b8 add replicated in service scale command description
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b9fdbbad6139e6dac5850e82bb67781f467e77c8
Component: engine
2016-11-02 16:15:57 +08:00
Sebastiaan van Stijn 50046511ff Merge pull request #27948 from WeiZhang555/consistent-filters
Replace all "Filter" field with "Filters" for consistency
Upstream-commit: f96d45dc8ac21db1f082230e2f828a86e15cad46
Component: engine
2016-11-02 00:53:15 -07:00
Sebastiaan van Stijn fcd5f70ab1 Merge pull request #27862 from crosbymichael/metrics-docs
Add metrics docs to cli reference
Upstream-commit: 85da2562f46491a51dda2bc804e2016a54cef6bf
Component: engine
2016-11-02 00:41:14 -07:00
Vincent Demeester cc06ee6ad8 Merge pull request #27848 from hqhq/remove_armhf_in_aarch64
Remove legacy armhf things in aarch64 Dockerfile
Upstream-commit: 68a981105fa1b4231ad5735ad758f87adf3bdb67
Component: engine
2016-11-02 08:09:59 +01:00
Sebastiaan van Stijn 2fdd11175c Merge pull request #27869 from bltavares/nuke-when-graphdir-is-a-mount
Nuke when graphdir is a mount
Upstream-commit: d1fe79ca84487b679d8e860e971ab82a3cc2dacf
Component: engine
2016-11-01 23:21:49 -07:00
Jana Radhakrishnan 42f7097187 Retry AttachNetwork when it fails to find network
When trying to attach to swarm scope network for an unmanaged container
sometimes even if attaching to network succeeds, we may not find the
network because some other container which was using the network went
down and removed the network. So if it is not found, try to detach and
reattach to re-download the network from the manager.

Fixes #26588

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 849e345e2c366d875b03f8b33b31308ba16fb4fd
Component: engine
2016-11-01 21:46:24 -07:00
Sebastiaan van Stijn bc07595486 Merge pull request #27942 from yuexiao-wang/remove-const
Remove some redundant consts
Upstream-commit: 2c43762cf2a33d9782c1a87ebf2469fc138a5c6b
Component: engine
2016-11-01 20:43:50 -07:00
yuexiao-wang 457e448f9f Remove some redundant consts
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6b412d4fd30afe2a24f66839a6c26fbc94b01493
Component: engine
2016-11-02 16:42:42 +08:00
Sebastiaan van Stijn ed695b371e Merge pull request #27864 from vdemeester/add-statsformat-to-configfile
Add StatsFormat to the config.json file
Upstream-commit: b998088145c1e7b6a2814a3dcb0f68855ae17123
Component: engine
2016-11-01 20:32:13 -07:00
Yong Tang 21f49a2c56 Fix issue related to duplicate identical bind mounts for docker run
This fix tries to address the issue raised in 27969 where
duplicate identical bind mounts for `docker run` caused additional volumes
to be created.

The reason was that in `runconfig`, if duplicate identical bind mounts
have been specified, the `copts.volumes.Delete(bind)` will not truly
delete the second entry from the slice. (Only the first entry is deleted).

This fix fixes the issue.

An integration test has been added to cover the changes

This fix fixes 27969.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 90ce6de50b3e5e39f8417e9804970c0fd1377062
Component: engine
2016-11-01 20:31:34 -07:00
Sebastiaan van Stijn c22d6298d7 Merge pull request #27855 from justincormack/check-ext3
Do not warn in check-config script about ext3 if provided by ext4
Upstream-commit: b5589fba89bdea5424b3555a892c43921a681974
Component: engine
2016-11-01 20:21:48 -07:00
Darren Stahl b8d232c6a7 Windows: Rename layers before deletion
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: be68006d1928b34936050175e67f85b4ee7f67cf
Component: engine
2016-11-01 18:05:09 -07:00
Tibor Vass 62f0d03ec2 Merge pull request #27920 from mavenugo/npp
Basic IT for plugin-v2 network driver
Upstream-commit: 1966f8e09d6b4bf4d65397f03e35a61bc1f979d8
Component: engine
2016-11-01 17:46:06 -07:00
Tibor Vass f3bf70acc7 Merge pull request #27960 from anusha-ragunathan/plugin_teardown
Add plugin cleanup as part of standard TearDownTest.
Upstream-commit: 0aefcd6ab660c21c6f7ed4486ab0033a99b9464a
Component: engine
2016-11-01 17:36:51 -07:00
Bruno Tavares cbd967cd2a Nuke when graphdir is a mount
Previously, when the graphdir was a root of a mountpoint, we would not
be able to cleanup the graphdir, as the script would umount in case
target dir is a mount itself

```/etc/mtab
/dev/xvdc1 /var/lib/docker btrfs
```

When running the script, the graphdir would be unmounted and it would
remove a (possibly) empty folder.

```
Nuking /var/lib/docker ...
  (if this is wrong, press Ctrl+C NOW!)

  + sleep 10

  + umount -f /var/lib/docker
  + rm -rf /var/lib/docker
  ```

This PR includes the necessary changes to nuke the folder on this
scenario, including when the graphdir is a btrfs mount iself.

Signed-off-by: Bruno Tavares <btavare@thoughtworks.com>
Upstream-commit: 5f98b977496b5c8430162b129cb94c88efb0f3b6
Component: engine
2016-11-01 22:22:25 -02:00
Tibor Vass 60d0e46ea2 Merge pull request #27924 from vieux/prevent_panic_volume_plugin_disable
prevent panic when docker build & volume plugin is disabled
Upstream-commit: cc8b8ce0b3d2d6b3345687464d3a3b1c2c4971ef
Component: engine
2016-11-01 14:57:52 -07:00
Derek McGowan 4bfee6fd15 Remove TarStreamFrom from RWLayer interface
RWLayers do not implement the tar stream from, moved the
definition to Layer instead of TarStreamer

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 8625d25351df680a0571c906ea0b59bf8092e0c6
Component: engine
2016-11-01 14:44:27 -07:00
Michael Crosby 6e6aed1482 Merge pull request #27908 from Microsoft/jjh/fix27601APIVersion
Windows: Require REST 1.25 or later
Upstream-commit: 70459d6f1ec98fa0aa0bf0d873838a9c4b5d3236
Component: engine
2016-11-01 14:32:32 -07:00
Michael Crosby c731e1c51c Merge pull request #27953 from thaJeztah/fix-deprecation-version
Update deprecation versions for "email" and colon in "security options"
Upstream-commit: 74bdacb908e0a49447bf81700162de4a29c4b2b6
Component: engine
2016-11-01 14:31:32 -07:00
Michael Crosby 9e9fd11160 Merge pull request #22641 from cpuguy83/build_finalization
Adds ability to flatten image after build
Upstream-commit: 22f3e43e9a35711bb63108f1714840a92a4b138e
Component: engine
2016-11-01 14:30:18 -07:00
epeterso 0c5998d38f remove world/group writable perms
change files from being written with group and world writable permissions.

Signed-off-by: epeterso <epeterson@breakpoint-labs.com>
Upstream-commit: 3ec8fed7476704f061891d4c421c615da49e30c7
Component: engine
2016-11-01 16:18:15 -04:00
Anusha Ragunathan 100bbd2718 Add plugin cleanup as part of standard TearDownTest.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 3e85271a64d466b65d5415f5096ccfe429becd29
Component: engine
2016-11-01 11:17:33 -07:00
Alexander Morozov 437925ef82 Merge pull request #27929 from daehyeok/logrus_refactoring
Fix logrus formatting
Upstream-commit: bf16fa47b7fcf5133818cd12bab1c2f60ba8d363
Component: engine
2016-11-01 11:12:46 -07:00
Brian Goff c7c95dc226 Adds ability to squash image after build
Allow built images to be squash to scratch.
Squashing does not destroy any images or layers, and preserves the
build cache.

Introduce a new CLI argument --squash to docker build
Introduce a new param to the build API endpoint `squash`

Once the build is complete, docker creates a new image loading the diffs
from each layer into a single new layer and references all the parent's
layers.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 362369b4bbea38881402d281ee2015d16e8b10ce
Component: engine
2016-11-01 13:41:59 -04:00
Sebastiaan van Stijn a2538f5356 Update deprecation versions for "email" and colon in "security options"
These features were originally scheduled
for removal in docker 1.13, but we changed
our deprecation policy to keep features
for three releases instead of two.

This updates the deprecation version
to match the deprecation policy.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e41a39dbae007b04e12504e75ef69fb1ae6ab7c9
Component: engine
2016-11-01 09:12:27 -07:00
Doug Davis d701a23f2e Merge pull request #27926 from miaoyq/optimized-indentation-of-codes-and-fix-two-typos
Optimized the indentation of codes and fix two typos
Upstream-commit: 4f347e2db2a3c181861c4e2a82ede2ea1d84e712
Component: engine
2016-11-01 11:36:53 -04:00
Zhang Wei 9cb45952e0 Replace all "Filter" field with "Filters" for consistency
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 89a6966726941b4b7f0431ab214013cf9c655c25
Component: engine
2016-11-01 23:09:30 +08:00
Sebastiaan van Stijn 1a1be648b1 Merge pull request #27931 from thaJeztah/add-akihiro-to-maintainers
add Akihiro to maintainers
Upstream-commit: ad4cce1573123f697ad794a680b3a4cd2cc613d2
Component: engine
2016-11-01 07:52:19 -07:00
Doug Davis d8e464eab6 Merge pull request #27412 from loftylabs/26249-make-unused-args-warning
Convert Unused ARG error to warning
Upstream-commit: f8d5d65fb86c6d6c5268c1d8cb20c3aa1725c726
Component: engine
2016-11-01 08:47:03 -04:00
Doug Davis d98705837f Merge pull request #27930 from YuPengZTE/devLogout
Align with other cli descriptions
Upstream-commit: 28dfeec2386a7096dcd22be5d1ae043b87fbf6a3
Component: engine
2016-11-01 08:39:04 -04:00
Sebastiaan van Stijn a691b85705 promote overlay(2) graphdriver
Now that overlay has matured, using
overlay is a better choice than devicemapper
on loopback devices.

This change promotes overlay in the
priority list. It also adds the
overlay2 graphdriver to the list
because overlay2 (if supported)
should be preferred over overlay.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 299beff1c4e2406d1e96c90a9e86e0770dd4342d
Component: engine
2016-10-31 23:32:10 -07:00
Sebastiaan van Stijn a20d6356d6 add Akihiro to maintainers
This adds Akihiro as a maintainer for
docker/docker, as was proposed and
voted on the maintainers mailinglist.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bc571700d2c720a44ee862e5a325bfcf7b781c97
Component: engine
2016-10-31 23:06:05 -07:00
yupeng c876442145 Align with other cli descriptions
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 06f160237426e705ed214a4f087d4aeea32c0a8b
Component: engine
2016-11-01 13:41:49 +08:00
Erik Hollensbe f2bb5045fe api/types/client.go: documentation fix for ImageImportSource
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
Upstream-commit: 6ab57aafa6584433eb48a3f6cfd5cdf32986fc5d
Component: engine
2016-10-31 21:17:55 -07:00
Daehyeok Mun 07a831dfc2 Fix logrus formatting
This fix tries to fix logrus formatting by removing `f` from
`logrus.[Error|Warn|Debug|Fatal|Panic|Info]f` when formatting string
is not present.

Fixed issue #23459

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: fa710e504b0e3e51d4031790c18621b02dcd2600
Component: engine
2016-10-31 22:05:01 -06:00
Addam Hardy bedb3b19ee Convert Unused ARG error to warning
Signed-off-by: Addam Hardy <addam.hardy@gmail.com>
Upstream-commit: f150f42009dddb4f9b8d4ceef8763af701b0d0f9
Component: engine
2016-10-31 21:42:50 -05:00
Vincent Demeester 80b8147332 Merge pull request #27916 from dnephin/refactor-client
Refactor client/request.go
Upstream-commit: d8d33148d809ec97794bbd492617b1be677cf820
Component: engine
2016-11-01 03:39:06 +01:00
Yanqiang Miao d5eeee5956 Optimized the indentation of codes and fix two typos
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: a9b6319e67bc4485df7210e3226d8940ab44962f
Component: engine
2016-11-01 10:35:18 +08:00
Victor Vieux 062853d1d4 prevent plugin when volume plugin is disabled
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 34f4b197b8cec5b177797e343a5c89473ff1d2aa
Component: engine
2016-10-31 17:59:45 -07:00
Madhu Venugopal 276bac2138 Basic IT for plugin-v2 network driver
Since the plugin APIs have not changed for local-scoped network drivers
between plugin-v1 and v2, a simple test to validate the bootstrapping
and network creation APIs would suffice.

Any network driver specific API validations are handled independent of
plugin v1 or v2 format.

Using a sample v2 network plugin :
https://github.com/mavenugo/test-docker-netplugin/

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 259441c027226683d38080caac7a39d6192c9dfa
Component: engine
2016-10-31 15:43:50 -07:00
Michael Crosby f308a9820e Add metrics docs to cli reference
Fixes #27843

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 66c2549be33213fa333457d090ada506ef39c5bb
Component: engine
2016-10-31 15:34:52 -07:00
Tibor Vass 60ab876d91 Merge pull request #26471 from yongtang/22717-workdir-windows
Use `filepath.Clean` in `normaliseWorkdir` for windows
Upstream-commit: 8cced8702261224ffd726774812eb50e8a600e52
Component: engine
2016-10-31 15:02:18 -07:00