Commit graph

32805 commits

Author SHA1 Message Date
Sebastiaan van Stijn
d14fb3ac4e
Remove deprecated contrib/mkimage-xyz scripts
The contrib/mkimage-busybox.sh, contrib/mkimage-debootstrap.sh,
and  contrib/mkimage-rinse.sh were deprecated in commit
51f707cf9d, in favor of
their equivalents in contrib/mkimage/

Given that the deprecation warning has been in place
for over three years, it's save to now remove these.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-21 21:56:24 -07:00
Brian Goff
e64c2d7122 Merge pull request #33755 from aaronlehmann/imagestore-locking
image: Improve store locking
2017-06-21 10:01:19 -07:00
Vincent Demeester
be02125491 Merge pull request #33749 from Microsoft/jjh/cross
Show what cross-build is executing
2017-06-21 17:17:10 +02:00
Vincent Demeester
9823457ed5 Merge pull request #33748 from cpuguy83/remove_osx_cross
Remove OSX cross stuff from main Dockerfile
2017-06-21 14:14:09 +02:00
Vincent Demeester
29c0238cac Merge pull request #33757 from tonistiigi/update-docker-py
dockerfile: update docker-py
2017-06-21 10:23:54 +02:00
Tonis Tiigi
d183d6fa7d dockerfile: update docker-py
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-20 22:03:35 -07:00
Aaron Lehmann
44e67adae5 image: Improve store locking
This showed up in a recent profile.

Search doesn't need to take a lock on the store, because digestset has
its own locking.

Some other methods can get by with a read lock instead of an exclusive
lock.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-20 18:31:29 -07:00
Brian Goff
88bddd46d8 Merge pull request #33694 from shakeme/master
Small fix and new option for contrib/mkimage_alpine.sh
2017-06-20 17:00:30 -07:00
Brian Goff
226bf3e0d9 Merge pull request #33587 from bergwolf/aufs
fix aufs mount option length calculation
2017-06-20 15:51:42 -07:00
Brian Goff
c621330ba9 Merge pull request #33639 from thaJeztah/cleanup-TestServiceCreateCompatiblePlatforms
Make TestServiceCreateCompatiblePlatforms use actual API response
2017-06-20 13:57:06 -07:00
Brian Goff
b5f68d7ed3 Merge pull request #33097 from stevvooe/remove-random-pkg
pkg: remove random package
2017-06-20 13:43:38 -07:00
John Howard
cdc39033ef Show what cross-build is executing
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-06-20 13:30:51 -07:00
Brian Goff
57f0e0c619 Remove OSX cross stuff from main Dockerfile
This is no longer needed here. It was required for compiling the CLI
which we no longer do here.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-06-20 13:06:37 -07:00
Vincent Demeester
99c72eb268 Merge pull request #33454 from dnephin/refactor-builder-remove-copy-on-build
[Builder] Move file coping from the daemon to the builder
2017-06-20 10:12:57 +02:00
Akihiro Suda
93c06b8013 Merge pull request #33725 from ripcurld0/deprecate_go16
Remove Go 1.6 code from moby
2017-06-20 08:54:01 +03:00
Sebastiaan van Stijn
16380b3ee6 Merge pull request #33522 from naveed-jamil-tenpearls/pkg/promise
Added Test Case Coverage for PKG/PROMISE
2017-06-19 13:53:42 -07:00
Brian Goff
7e3d0a54a1 Merge pull request #33732 from nhorman/cookie-clean-up
devmapper: ensure that UdevWait is called after calls to setCookie
2017-06-19 13:26:02 -07:00
Neil Horman
23dcfec140 devmapper: ensure that UdevWait is called after calls to setCookie
Recent changes to devmapper broke the implicit requirement that UdevWait be
called after every call to task.setCookie.  Failure to do so results in leaks of
semaphores in the LVM code, eventually leading to semaphore exhaustion.
Previously this was handled by calling UdevWait in a ubiquitous defer function.
While there was initially some concern with deferring the UdevWait function
would cause some amount of race possibiliy, the fact that we never return the
cookie value or any value used to find it, makes that possibility seem unlikely,
so lets go back to that method

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
2017-06-19 13:50:57 -04:00
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
Boaz Shuster
6bfd0f6b5d Remove Go 1.6 code from moby
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-06-19 15:59:00 +03: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
Robert Schneider
23f0c20b02 Add option for architecture to mkimage-alpine.sh
Signed-off-by: Robert Schneider <mail@shakeme.info>
2017-06-15 15:52:25 +02:00
Robert Schneider
a89d282dbb Fix getopts in mkimage-alpine.sh
Signed-off-by: Robert Schneider <mail@shakeme.info>
2017-06-15 15:51:56 +02: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