Commit graph

32777 commits

Author SHA1 Message Date
Brian Goff
630b9a45d2 Merge pull request #33695 from cpuguy83/volumes_check_ownership
Don't chown/chmod volumes if not needed.
2017-06-19 06:31:58 -07:00
Brian Goff
f0024808a1 Merge pull request #33727 from rremer/test-cleanup-daemon-logger
cleanup daemon/logger/adapter_test.go
2017-06-19 05:56:43 -07:00
Royce Remer
b3add005d5 * standardize timeouts for log reads and writes for logger adapter tests
* use an assertion framework in logger adapter tests

Signed-off-by: Royce Remer <royceremer@gmail.com>
2017-06-18 18:47:45 -07:00
Brian Goff
f05a023760 Don't chown/chmod volumes if not needed.
Doing a chown/chmod automatically can cause `EPERM` in some cases (e.g.
with an NFS mount). Currently Docker will always call chown+chmod on a
volume path unless `:nocopy` is passed in, but we don't need to make
these calls if the perms and ownership already match and potentially
avoid an uneccessary `EPERM`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-06-18 16:44:52 -07:00
Tõnis Tiigi
4f259698b0 Merge pull request #33403 from szegedim/33126-whitelist-adjtimex
Whitelisting adjtimex get time operation and requiring CAP_SYS_TIME only in case of adjustment
2017-06-16 21:30:35 -07:00
Sebastiaan van Stijn
acf23c7367 Merge pull request #33517 from naveed-jamil-tenpearls/pkg/reexec
Added Test Case Coverage for PKG/REEXEC
2017-06-16 15:24:51 +02:00
Brian Goff
0919a1da14 Merge pull request #33712 from cyli/redact-ca-signing-cert
Redact swarm spec CA signing cert for usability reasons
2017-06-16 09:21:59 -04:00
Sebastiaan van Stijn
a6911bf8cc Merge pull request #32547 from allencloud/make-ulimitOpt-implement-NamedOption
add NamedUlimitOpt to implement NamedOption to fix 32528
2017-06-16 11:27:01 +02:00
Sebastiaan van Stijn
cc73511764 Merge pull request #33705 from tonistiigi/fix-cobra-vendor
vendor: remove unused package
2017-06-16 10:35:50 +02:00
allencloud
148f2711e8 add NamedUlimitOpt implement NamedOption to fix 32528
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-06-16 10:14:09 +08:00
Ying Li
bdfbd22afb Redact the swarm's spec's signing CA cert when getting swarm info, because
otherwise if the user gets the info from the API, makes a non-CA related change,
then updates, swarm will interpret this as the user trying to remove the signing
key from the swarm.  We are redacting due to usability reasons, not because
the signing cert is secret.  The signing KEY is secret, hence it's redacted.

Signed-off-by: Ying Li <ying.li@docker.com>
2017-06-15 18:26:01 -07:00
John Howard
b931c35a46 Merge pull request #33498 from darrenstahlmsft/IoTDataPartition
Skip evaluation of symlinks to data root on IoT Core
2017-06-15 15:52:01 -07:00
Tonis Tiigi
932759c288 vendor: remove unused package
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-15 13:23:11 -07:00
Tõnis Tiigi
5eca8382b0 Merge pull request #33585 from moypray/containerd_core
When daemon is in startup process, could not start container
2017-06-15 09:13:41 -07:00
Aaron Lehmann
6d92b0ee15 Merge pull request #33302 from cpuguy83/fix_logs_racey_test_win
Make TestLogsAPIStdout a bit less racey
2017-06-14 16:35:22 -07:00
Sebastiaan van Stijn
e5679f0bff Merge pull request #33680 from glensc/patch-1
doc: Update 2017-06-12.md
2017-06-14 23:11:23 +02:00
Kenfe-Mickaël Laventure
c86323c19d Merge pull request #33361 from aaronlehmann/no-join-address
cluster: Only pass a join address when in the process of joining a cluster
2017-06-14 14:08:37 -07:00
Elan Ruusamäe
35e15c5c04 Update 2017-06-12.md
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
2017-06-14 23:16:22 +03:00
Vincent Demeester
7fdc2e42d1 Merge pull request #33637 from thaJeztah/improve-ci-build-time
Minor refactor/cleanup of tests
2017-06-14 19:45:48 +02:00
Vincent Demeester
397a57d3a5 Merge pull request #33640 from dsheets/pluginv2-static-start-but-disabled-error
plugin/store.Get: return a specific error if plugin is disabled
2017-06-14 15:35:26 +02:00
Vincent Demeester
0c2f3bcd82 Merge pull request #33053 from simonferquel/ignore-private-networks
Ignore HNS networks with type `Private`
2017-06-14 14:20:39 +02:00
Wentao Zhang
5b0993d6c7 When daemon is in startup process, could not start container
Description:
 When docker is in startup process and containerd sends an "process exit" event to docker.
 If the container config '--restart=always', restartmanager will start this container very soon.

 But some initialization is not done, e.g. `daemon.netController`,when visit, docker would panic.

Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com>
2017-06-14 18:53:18 +08:00
Vincent Demeester
11293d91f9 Merge pull request #33655 from dsheets/authz-disable-race
Eliminate authz plugin disable race
2017-06-14 11:07:23 +02:00
Brian Goff
7959c2e49d Merge pull request #33663 from vieux/report-2017-06-12
Moby Dev Report 2017 06 12
2017-06-13 23:05:57 -05:00
Brian Goff
6d556df196 Merge pull request #33665 from tiborvass/remove-docs
Remove docs (except docs/api), experimental/, contrib/completion, man/
2017-06-13 23:04:25 -05:00
Tibor Vass
b5579a4ce3 Remove docs (except docs/api), experimental/, contrib/completion, man/
They have been moved to github.com/docker/cli.

Signed-off-by: Tibor Vass <tibor@docker.com>
2017-06-14 03:14:46 +00:00
Victor Vieux
b9dfa9ab75 Moby June 12th dev report
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-06-13 19:02:26 -07:00
Darren Stahl
8e71b1e210 Skip evaluation of symlinks to data root on IoT Core
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-06-13 15:02:35 -07:00
Victor Vieux
9c446a4d00 Merge pull request #33518 from naveed-jamil-tenpearls/pkg/sysinfo
Increased Unit Test Coverage for PKG/SYSINFO
2017-06-13 10:57:49 -07:00
David Sheets
24264697c5 authz: remove and hide unused and local-only methods respectively
Signed-off-by: David Sheets <dsheets@docker.com>
2017-06-13 13:51:11 +01:00
David Sheets
7da3986297 authz: eliminate race during plugin removal from middleware
Also, this removes the use of a questionable golang range feature which
corrects for mutation of a slice during iteration over that slice. This
makes the filter operation easier to read and reason about.

Signed-off-by: David Sheets <dsheets@docker.com>
2017-06-13 13:51:07 +01:00
Brian Goff
bccebdac18 Merge pull request #32468 from coolljt0725/clean_thin
devicemapper: remove thin pool if 'initDevmapper' failed
2017-06-13 07:34:15 -05:00
Sebastiaan van Stijn
5052986afc Merge pull request #33621 from thaJeztah/fix-runc-version-exec
Fix missing "--version" argument
2017-06-13 14:18:17 +02:00
Vincent Demeester
c21c17c642 Merge pull request #32088 from simonferquel/windows-dockerignore-fix
Fix behavior of absolute paths in .dockerignore
2017-06-13 13:36:39 +02:00
Simon Ferquel
b91fd26bb5 Ignore HNS networks with type Private
Fix #33052 (workaround style)

**- What I did**

HNS reports networks that don't have anything to do with the Daemon, and
for which no networking plugin is available. This make the Daemon start
sequence pause for 15 secs, as the plugin resolving logic has a wait &
retry logic

**- How I did it**

Just after retrieving the HNS networks, I filter out those with type
`Private`

**- How to verify it**

Replace dockerd coming with Docker for Windows from one built from this
PR. Windows containers daemon should now launch pretty quickly

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2017-06-13 13:25:00 +02:00
Sebastiaan van Stijn
e22656bf2d Merge pull request #33645 from thaJeztah/disable-auto-milestone
Disable auto-assigning PR's to milestones
2017-06-13 11:13:08 +02:00
Vincent Demeester
ae487e543c Merge pull request #33571 from thaJeztah/client-api-version-checks
Add API version checks to client
2017-06-13 10:50:05 +02:00
Tonis Tiigi
810015c5ff Add builder dev report for 2017-06-12
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-12 19:07:06 -07:00
Sebastiaan van Stijn
e481509c74
Disable auto-assigning PR's to milestones
Moby and Docker are separate projects, so
don't assign docker milestones to pull requests
in this repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-13 03:32:48 +02:00
Aaron Lehmann
4310f7da7e Merge pull request #33630 from yongtang/167-cli-network-inspect-scope
Add `scope` filter in `GET /networks/(id or name)`
2017-06-12 18:27:24 -07:00
Sebastiaan van Stijn
8183b9d12c Merge pull request #33374 from raja-sami-10p/pkg/plugins
Increase the Coverage of pkg/plugins
2017-06-13 02:50:54 +02:00
Victor Vieux
3029e4b73c Merge pull request #33642 from aaronlehmann/vendor-swarmkit-a4bf013
Vendor swarmkit a4bf013
2017-06-12 17:41:31 -07:00
Brian Goff
ff2127968d Merge pull request #33638 from coolljt0725/mnt_deatch
Use lazy umount on Put for overlay2 and overlay
2017-06-12 18:58:55 -05:00
Sebastiaan van Stijn
f4bf61c79d Merge pull request #33005 from alfred-landrum/denied-error
Suggest login on pull denial
2017-06-13 01:51:18 +02:00
Brian Goff
2ae085f309 Merge pull request #33414 from darrenstahlmsft/IoTServerContainers
Check for Windows 10 IoT Core to use process isolation on IoT
2017-06-12 18:02:15 -05:00
Sebastiaan van Stijn
5d04fe73bf
Simplify DockerRegistrySuite.TestUserAgentPassThrough()
This patch simplifies the test by;

- re-using the registry-mock / handler
- skipping the last `docker build`, which was only
  used to make sure a local image was present. Instead,
  the daemon is started with a `busybox` image loaded.

Also added a comment, explaining why the mock always
returns a 404 (hence, error/output-string should not
be checked in the test), and made the mock return a
valid/correctly formatted error response.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-12 20:18:03 +02:00
Sebastiaan van Stijn
ebe66b1d0f
Use tempdir instead of working directory as build-context
The `makefile()` utility was used to create a temporary Dockerfile, and after
tests completed, this file was deleted.

However, the _build_ used the current path (`/usr/local/bin/docker`) as
build-context. As a result, roughtly 20 MB was sent as build-context for each
build, but none of the builds actually required a build-context.

This patch;

- creates a temp-dir for the test, which can be used as build-context
- changes the `makefile()` utility and removes the `cleanup` functionality
- instead, the `temp-dir` is removed after the test finishes (which also removes the temporary `Dockerfile`)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-12 20:14:48 +02:00
unclejack
ac587c40ca Merge pull request #33472 from unclejack/use_buffer_io_copy
container/stream/attach: use pools.Copy
2017-06-12 11:14:45 -07:00
Sebastiaan van Stijn
dd790d0e37 Merge pull request #33608 from thaJeztah/backport-29083
"back port" #29083
2017-06-12 19:54:37 +02:00
Aaron Lehmann
32d7b0f360 Vendor swarmkit a4bf013
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-12 10:31:11 -07:00