Commit graph

35434 commits

Author SHA1 Message Date
Vincent Demeester
c8bda42d16
Merge pull request #37390 from thaJeztah/update_cfssl_for_swarmkit
Update cloudflare/cfssl to 1.3.2
2018-07-09 09:10:25 +02:00
Sebastiaan van Stijn
905811f366
Merge pull request #37409 from ctelfer/rm-libnet-error-wrapping
Fix faulty error type checking in removeNetwork()
2018-07-08 20:18:40 +02:00
Sebastiaan van Stijn
d4bbd7938a
Merge pull request #37415 from storykim/test-md-typo
Fix typo on test.md
2018-07-08 17:13:21 +02:00
Donghwa Kim
3048c3a768 Fix typo on test.md
It said `TESTFLAGS='-test.run ^TestValidateIPAddress$' make test-unit`
runs `TestBuild` test, but actually runs `TestValidateIPAddress` test.

Signed-off-by: Donghwa Kim <shanytt@gmail.com>
2018-07-08 18:22:21 +09:00
Chris Telfer
6225d1f15c Get err type in removeNetworks() w/ errors.Cause()
Commit c0bc14e8 wrapped the return value of nw.Delete() with some extra
information.  However, this breaks the code in
containerAdaptor.removeNetworks() which ignores certain specific
libnetwork error return codes.  Said codes actually don't represent
errors, but just regular conditions to be expected in normal operation.
The removeNetworks() call checked for these errors by type assertions
which the errors.Wrap(err...) breaks.

This has a cascading effect, because controller.Remove() invokes
containerAdaptor.removeNetworks() and if the latter returns an error,
then Remove() fails to remove the container itself.  This is not
necessarily catastrophic since the container reaper apparently will
purge the container later, but it is clearly not the behavior we want.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-07-07 18:18:53 -04:00
Brian Goff
ae1160b8d8
Merge pull request #37411 from tonistiigi/vendor-containerd
vendor: update containerd to b41633746
2018-07-06 18:37:31 -07:00
Tonis Tiigi
f0e6158266 vendor: update containerd to b41633746
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-06 14:43:49 -07:00
Sebastiaan van Stijn
86a41e4ef7
Merge pull request #37404 from runcom/no-acpi
Add /proc/acpi to masked paths
2018-07-06 22:40:08 +02:00
Vincent Demeester
aba2735e3f
Merge pull request #37394 from yongtang/07052018-ipcmode
Migrate some ipcmode tests to integration
2018-07-06 10:00:03 +02:00
Sebastiaan van Stijn
13f9a25a42
Merge pull request #37399 from cyli/bump-swarmkit
Bump swarmkit to include task reaper fixes and more metrics.
2018-07-06 09:30:40 +02:00
Ying Li
b322705750 Bump swarmkit to include task reaper fixes and more metrics.
This includes the following behavior-modifying PRs:

- docker/swarmkit#2673
- docker/swarmkit#2669
- docker/swarmkit#2675
- docker/swarmkit#2664

Signed-off-by: Ying Li <ying.li@docker.com>
2018-07-05 15:24:10 -07:00
Sebastiaan van Stijn
656036ce2c
Merge pull request #37157 from debayande/even-more-names
Adds a few more names to the name generator.
2018-07-05 21:06:12 +02:00
Sebastiaan van Stijn
cfc75f91ab
Merge pull request #37378 from cpuguy83/fix_bindmount_src_create_race
Fix bindmount autocreate race
2018-07-05 20:36:49 +02:00
Brian Goff
e9c0435178
Merge pull request #37392 from thaJeztah/bump_fsnotify
update fsnotify to v1.4.7
2018-07-05 10:50:25 -07:00
Antonio Murdaca
569b9702a5
Add /proc/acpi to masked paths
The deafult OCI linux spec in oci/defaults{_linux}.go in Docker/Moby
from 1.11 to current upstream master does not block /proc/acpi pathnames
allowing attackers to modify host's hardware like enabling/disabling
bluetooth or turning up/down keyboard brightness. SELinux prevents all
of this if enabled.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2018-07-05 17:39:52 +02:00
Vincent Demeester
06dee4cc27
Merge pull request #37393 from mykeul/master
Added "--no-cache" to apk call to reduce alpine base image by 10-12% …
2018-07-05 15:06:21 +02:00
Sebastiaan van Stijn
65dce935a6
Merge pull request #37388 from ianre657/patch-1
add vim-plug setting
2018-07-05 14:50:28 +02:00
Sebastiaan van Stijn
8d56fa0bb7
Merge pull request #37380 from yui-knk/update_doc_Detect
Update documents of `Detect`
2018-07-05 14:49:18 +02:00
Mickaël Remars
e72047a375 Replaced "--update-cache" argument with "--no-cache" in apk call to reduce alpine base image by 10-12% (avoid useless indexes in /var/cache/apk)
Signed-off-by: Mickaël Remars <github@remars.com>
2018-07-04 23:34:30 +02:00
Yong Tang
e0403604e2 Migrate some ipcmode tests to integration
This fix migrates some ipcmode tests in integration-cli
to integration tests.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2018-07-04 16:32:18 +00:00
Sebastiaan van Stijn
7084487fdc
Update cloudflare/cfssl to 1.3.2
Matching the version that is used in SwarmKit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-04 17:47:22 +02:00
Sebastiaan van Stijn
9f016c0fe1
update fsnotify to v1.4.7
Fixes a possible deadlock on closing the watcher on kqueue

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-07-04 16:58:25 +02:00
Ian Chen
a765210718 add vim-plug setting
this should work ( tried on my machine)

Signed-off-by: Ian Chen <ianre657@gmail.com>
2018-07-04 15:54:19 +08:00
Tibor Vass
b711437bbd
Merge pull request #37381 from tiborvass/api-platforms-as-string-for-temp
api: Change Platform field back to string (temporary workaround)
2018-07-03 17:54:42 -07:00
Tibor Vass
4b3df087a2
Merge pull request #37385 from tonistiigi/update-buildkit
vendor: update buildkit to 9acf51e491
2018-07-03 17:33:54 -07:00
Tibor Vass
facad55744 api: Change Platform field back to string (temporary workaround)
This partially reverts https://github.com/moby/moby/pull/37350

Although specs.Platform is desirable in the API, there is more work
to be done on helper functions, namely containerd's platforms.Parse
that assumes the default platform of the Go runtime.

That prevents a client to use the recommended Parse function to
retrieve a specs.Platform object.

With this change, no parsing is expected from the client.

Signed-off-by: Tibor Vass <tibor@docker.com>
2018-07-03 22:33:42 +00:00
Tonis Tiigi
6144f50e55 vendor: update buildkit to 9acf51e491
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-03 15:22:39 -07:00
Sebastiaan van Stijn
1da7d2eebf
Merge pull request #37368 from tiborvass/buildkit-iidfile
builder: return image ID in API when using buildkit
2018-07-04 00:20:25 +02:00
Tonis Tiigi
6f7dd9428e builder: do not send duplicate status for completed jobs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-07-03 14:47:38 -07:00
Tibor Vass
ca8022ec63 builder: return image ID in API when using buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-07-03 19:11:02 +00:00
Sebastiaan van Stijn
6273dffbda
Merge pull request #37242 from nvcastet/fix_sys_nice_seccomp
Whitelist syscalls linked to CAP_SYS_NICE in default seccomp profile
2018-07-03 19:23:07 +02:00
Sebastiaan van Stijn
dca4cab55d
Merge pull request #37371 from ctelfer/bump-libnw-430c00a
bump libnetwork to 430c00a
2018-07-03 19:09:41 +02:00
Sebastiaan van Stijn
e54bbc0326
Merge pull request #37379 from yui-knk/fix_add_command_doc
Update documents of `dispatchAdd`
2018-07-03 08:37:57 +02:00
Debayan De
9d61eee75a Adds a few more names to the name generator.
Signed-off-by: Debayan De <debayande@users.noreply.github.com>
2018-07-03 02:12:46 +01:00
Yuichiro Kaneko
0bbd476ceb Update documents of Detect
By 0296797f0f, `progressReader`
and `remoteURL` were removed from arguments. So developers who
use `Detect` not need to care about when `ProgressReaderFunc`
is used.

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
2018-07-03 09:13:25 +09:00
Yuichiro Kaneko
9b374801ac Update documents of dispatchAdd
`ADD` does not support git.

Ref: https://github.com/moby/moby/issues/14704#issuecomment-298134333

Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com>
2018-07-03 08:51:07 +09:00
Brian Goff
1caeb79963 Fix bindmount autocreate race
When using the mounts API, bind mounts are not supposed to be
automatically created.

Before this patch there is a race condition between valiating that a
bind path exists and then actually setting up the bind mount where the
bind path may exist during validation but was removed during mountpooint
setup.

This adds a field to the mountpoint struct to ensure that binds created
over the mounts API are not accidentally created.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2018-07-02 13:42:33 -07:00
Vincent Demeester
b0e6eedcf4
Merge pull request #37359 from dmcgowan/register-oci-mediatypes
Register OCI media types
2018-07-02 14:26:36 +02:00
Sebastiaan van Stijn
8d1b280a25
Merge pull request #37374 from haikuoliu/branch_endpoint
Pass endpoint to the CloudWatch Logs logging driver
2018-06-30 11:22:55 +02:00
Chris Telfer
efb7909bef Update tests w/ new libnetwork contraints
The TestDockerNetworkIPAMMultipleNetworks test allocates several
networks simultaneously with overlapping IP addresses.  Libnetwork now
forbids this.  Adjust the test case to use distinct IP ranges for the
networks it creates.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-06-29 15:15:52 -04:00
haikuoliu
998478d369 Pass endpoint to the CloudWatch Logs logging driver
Signed-off-by: haikuoliu <haikuo@amazon.com>
2018-06-29 11:27:37 -07:00
John Howard
a2a3b8fe9c
Merge pull request #37369 from johnstep/update-windows-manifest-sorting
LCOW: Prefer Windows over Linux in a manifest list
2018-06-29 09:19:30 -07:00
Chris Telfer
f155f828a2 bump libnetwork to 430c00a
Bump libnetwork to 430c00a6a6b3dfdd774f21e1abd4ad6b0216c629.  This
includes the following moby-affecting changes:

 * Update vendoring for go-sockaddr (8df9f31a)
 * Fix inconsistent subnet allocation by preventing allocation of
   overlapping subnets (8579c5d2)
 * Handle IPv6 literals correctly in port bindings (474fcaf4)
 * Update vendoring for miekg/dns (8f307ac8)
 * Avoid subnet reallocation until required (9756ff7ed)
 * Bump libnetwork build to use go version 1.10.2 (603d2c1a)
 * Unwrap error type returned by PluginGetter (aacec8e1)
 * Update vendored components to match moby (d768021dd)
 * Add retry field to cluster-peers probe (dbbd06a7)
 * Fix net driver response loss on createEndpoint (1ab6e506)
   (fixes https://github.com/docker/for-linux/issues/348)

Signed-off-by: Chris Telfer <ctelfer@docker.com>
2018-06-29 11:03:20 -04:00
Sebastiaan van Stijn
7f3aeb8432
Merge pull request #37370 from albers/custom-bashrc
Re-add support for a custom .bashrc file in build env
2018-06-29 16:37:17 +02:00
Harald Albers
f2c5857612 Re-add support for a custom .bashrc file in build env
Signed-off-by: Harald Albers <github@albersweb.de>
2018-06-29 12:39:36 +02:00
Sebastiaan van Stijn
26becc002c
Merge pull request #37364 from thaJeztah/bump_go_winio
Update Microsoft/go-winio to 0.4.8
2018-06-29 09:01:13 +02:00
John Stephens
ddcdb7255d
LCOW: Prefer Windows over Linux in a manifest list
When a manifest list contains both Linux and Windows images, always
prefer Windows when the platform OS is unspecified. Also, filter out any
Windows images with a higher build than the host, since they cannot run.

Signed-off-by: John Stephens <johnstep@docker.com>
2018-06-28 20:30:41 -07:00
Derek McGowan
c4f0515837
Register OCI image media types
OCI types are backwards compatible with Docker manifest
types, however the media types must be registered.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-06-28 18:19:15 -07:00
Sebastiaan van Stijn
d912e9460e
Merge pull request #37156 from cpuguy83/networking_api_types_only
Move network conversions out of API router
2018-06-29 02:47:27 +02:00
Sebastiaan van Stijn
74095588ba
Update Microsoft/go-winio to 0.4.8
Fixes named pipe support for hyper-v isolated containers

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-28 18:55:45 +02:00