Commit Graph

33967 Commits

Author SHA1 Message Date
3a237eae5f Merge pull request #4 from mlaventure/chp-moby-33376
Ensure that a device mapper task is referenced until task is complete
2017-06-05 06:09:13 -07:00
8330e07f4a Merge pull request #3 from mlaventure/chp-moby-33365
Update go-winio to v0.4.2
2017-06-05 06:05:37 -07:00
9a732dbff3 Merge pull request #2 from mlaventure/chp-moby-33422
Don't unmount entire plugin manager tree on remove
2017-06-05 05:37:07 -07:00
09185931e1 Merge pull request #9 from mlaventure/chp-moby-33387
Bump go to go1.8.3
2017-06-02 10:38:59 -07:00
8d44c9a703 Merge pull request #1 from mlaventure/chp-moby-33409
prevent image prune panic
2017-06-02 10:38:26 -07:00
0334cfffff Merge pull request #20 from mlaventure/chp-moby-33474
Use actual cli version for TestConfigHTTPHeader
2017-06-02 10:33:44 -07:00
a9548340cb Use actual cli version for TestConfigHTTPHeader
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 0b90edc22fa95e04b4d3208a72bb276be699b260)
2017-06-01 17:13:23 -07:00
e7776047c2 Bump go to go1.8.3
Note that go1.8.2 contains a security fix (CVE-2017-8932).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 0c7c900e9e66335a6bd486be008af43ae83a5a37)
2017-05-31 11:29:38 -07:00
96c9cd5c39 Ensure that a device mapper task is referenced until task is complete
DeviceMapper tasks in go use SetFinalizer to clean up C construct
counterparts in the C LVM library.  While thats well and good, it relies
heavily on the exact interpretation of when the golang garbage collector
determines that an object is unreachable is subject to reclaimation.
While common sense would assert that for stack variables (which these DM
tasks always are), are unreachable when the stack frame in which they
are declared returns, thats not the case.  According to this:

https://golang.org/pkg/runtime/#SetFinalizer

The garbage collector decides that, if a function calls into a
systemcall (which task.run() always will in LVM), and there are no
subsequent references to the task variable within that stack frame, then
it can be reclaimed.  Those conditions are met in several devmapper.go
routines, and if the garbage collector runs in the middle of a
deviceMapper operation, then the task can be destroyed while the
operation is in progress, leading to crashes, failed operations and
other unpredictable behavior.

The fix is to use the KeepAlive interface:

https://golang.org/pkg/runtime/#KeepAlive

The KeepAlive method is effectively an empy reference that fools the
garbage collector into thinking that a variable is still reachable.  By
adding a call to KeepAlive in the task.run() method, we can ensure that
the garbage collector won't reclaim a task object until its execution
within the deviceMapper C library is complete.

Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
(cherry picked from commit d764d8b16624e4924b3949273089f851efa0f717)
2017-05-31 10:42:53 -07:00
4360062d33 Update go-winio to v0.4.2
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 3f13107223a9753d709c196c46f1c846041fc0c3)
2017-05-31 10:39:35 -07:00
5acb14a901 Don't unmount entire plugin manager tree on remove
This was mistakenly unmounting everything under `plugins/*` instead of
just `plugins/<id>/*` anytime a plugin is removed.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit db5f31732a9868c1e9e4f9a49be70b794ff82d4f)
2017-05-31 10:37:33 -07:00
43484d9284 prevent image prune panic
Signed-off-by: Alfred Landrum <alfred.landrum@docker.com>
(cherry picked from commit 32da2a4234c5c68ff466dc1afc91ba98dbbe199a)
2017-05-31 09:58:11 -07:00
7f8486a39a pass in git commit override when building deb
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 3c70b56937c415c6bf3516aeaa5231c6d7d3145d)
v17.06.0-ce-rc1
2017-05-25 06:00:03 +00:00
5f615dd295 override ver and git commit when building all deb pkgs
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 4397990e00863254d78c44fbe904a70272b5b340)
2017-05-25 05:59:47 +00:00
f3810787c8 pass in optional GITCOMMIT override
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 446af3a9b7)
2017-05-24 23:03:09 +00:00
2bcfe6ffc2 bump VERSION files to 17.06.0-ce-rc1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-24 02:24:43 +00:00
0b4548c769 allow version number to be set in builds
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 3dfe334a7a)
2017-05-24 02:21:53 +00:00
3faf0eaaca Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-05-20 06:07:04 +00:00
ca31069c30 added clean target to the makefile
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-20 06:06:29 +00:00
2c17301752 pass the top-level version to packaging targets
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-20 06:03:35 +00:00
3e531d5fd4 change default target to call for static binaries
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-20 06:02:06 +00:00
a36b59a609 fix static package generation
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 3513248c56fc917a0b37ff140ca7981d7af933ef
Component: packaging
2017-05-20 06:00:56 +00:00
b3f06aaffe Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-05-20 05:12:23 +00:00
61ed131a71 initial commit
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f64fc552cdfc4b4f2efb384054970fb0bfc1bd25
Component: packaging
2017-05-20 05:11:06 +00:00
969598bdd6 Initial commit
Upstream-commit: 3b31275fd8206e35f73e37d91ccaea19446eb79c
Component: packaging
2017-05-19 20:08:25 -07:00
b89892dc70 added more words to readme
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-20 00:22:54 +00:00
3335862e61 Merge component 'engine' from git@github.com:moby/moby master 2017-05-19 23:48:32 +00:00
ee4c982801 Merge component 'cli' from git@github.com:docker/cli master 2017-05-19 23:24:51 +00:00
37d72b0858 initial commit
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-19 23:20:37 +00:00
56595bb8e6 initial readme
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-05-19 16:10:50 -07:00
ddd4203548 Merge pull request #33261 from aaronlehmann/empty-platform
api: Only return a Platform when relevant information is available
Upstream-commit: f888a25ff5bc9bb7c95400ec19b9a5fa0d738bab
Component: engine
2017-05-19 20:05:07 +02:00
756d246384 Merge pull request #33299 from thaJeztah/explain-relation-between-paused-and-stopped
Improve description of Running and Paused booleans
Upstream-commit: 58b1788c81f937bb2aaf1b0077c6b3b23a8397ff
Component: engine
2017-05-19 16:29:05 +02:00
1dc2936c51 Merge pull request #33293 from fd/patch-1
Remove deadlock in ContainerWait
Upstream-commit: d98d4faef86c4ba4470c7f28c2ce92c10de4a565
Component: engine
2017-05-19 16:17:54 +02:00
b0a3ababea Merge pull request #33286 from aboch/ingr
Properly identify ingress network created with older swarm
Upstream-commit: 39a604c0d419424bab0314e7070c49bcacca3bda
Component: engine
2017-05-19 10:04:29 -04:00
845a39e447 Merge pull request #33296 from vdemeester/more-opts-cleanup
Remove more opts unused in docker/docker
Upstream-commit: d8e85f8c60929e0bc1313983f5007ad92f8adf29
Component: engine
2017-05-19 10:01:34 -04:00
cd659b1f37 Merge pull request #33291 from YuPengZTE/devFilter
arg filter for printf verb %s of wrong type
Upstream-commit: a3536d2c6d5df6e2280366edebe6d240dc757111
Component: engine
2017-05-19 12:33:33 +02:00
4bffda81c9 Improve description of Running and Paused booleans
Commit abd72d4008dde7ee8249170d49eb4bc963c51e24 added
a "FIXME" comment to the container "State", mentioning
that a container cannot be both "Running" and "Paused".

This comment was incorrect, because containers on
Linux actually _must_ be running in order to be
paused.

This patch adds additional information both in a
comment, and in the API documentation to clarify
that these booleans are not mutually exclusive.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b654b6244d6d63a0758029488a95feb446e089bd
Component: engine
2017-05-19 12:29:54 +02:00
64383889f3 Remove more opts unused in docker/docker
These are already present in `docker/cli` 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 61e527f16ccbbbca137c4db1b13b558ee4a51213
Component: engine
2017-05-19 12:05:51 +02:00
87298d4be7 Remove deadlock in ContainerWait
when `cli.post(...)` fails `errC <- err` blocks because `errC` is unbufferd.

Signed-off-by: Simon Menke <simon.menke@gmail.com>
Upstream-commit: 4d2d2ea39336aade783c5c415b83d129bdd339bb
Component: engine
2017-05-19 09:23:52 +02:00
1e0f9dbab8 arg filt
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 49bf533fe72fd2390da89d133fbe984d0284ebe2
Component: engine
2017-05-19 13:47:32 +08:00
fc392f988e Merge pull request #33280 from mavenugo/vin-ln-1706
Vendoring libnetwork b2bc1a684
Upstream-commit: ab83b924bc5dde5c2ac81b0befe5e370f3acb7e3
Component: engine
2017-05-18 23:31:23 -04:00
ba221c0328 Properly identify ingress network created with older swarm
- otherwise docker network prune will remove it

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 93763f11eeec5e9b1d0308a3ad85bbf069f9107f
Component: engine
2017-05-18 19:47:45 -07:00
01eae47819 Merge pull request #33281 from dmcgowan/overlay2-on-btrfs
Support overlay2 on btrfs
Upstream-commit: 01af41ed99f96693bd04bec1cf0f7a6b97bc2408
Component: engine
2017-05-19 03:09:39 +02:00
200114130e Merge pull request #33278 from tonistiigi/plugin-chroot
Use chrootarchive for plugin rootfs
Upstream-commit: 6c05ceeb0b483f15b4b7b449db6c3f32a5e30d6b
Component: engine
2017-05-19 02:38:29 +02:00
a41009bb07 Merge pull request #33269 from tophj-ibm/switch-more-syscalls-pkg-term
[pkg/term] switch more syscalls to /x/sys/
Upstream-commit: dd27bbb41a7f98a0beea3d7f39da0dbb53e29ff5
Component: engine
2017-05-19 02:37:52 +02:00
10c5371927 Support overlay2 on btrfs
OverlayFS is supported on top of btrfs as of Linux Kernel 4.7.
Skip the hard enforcement when on kernel 4.7 or newer and
respect the kernel check override flag on older kernels.
https://btrfs.wiki.kernel.org/index.php/Changelog#By_feature

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: f64a4ad008e68996afcec3ab34a869887716f944
Component: engine
2017-05-18 15:26:03 -07:00
f6ecbd87c6 Vendoring libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 9b0e1df4dd2dbab6d2aacfaae0ea27deaf5c7c62
Component: engine
2017-05-18 15:14:12 -07:00
2d8e76dfbc Merge pull request #33274 from aaronlehmann/update-cli
Update CLI commit hash
Upstream-commit: da9a8854834cb48a8112d8192811d9c41f8be358
Component: engine
2017-05-18 15:11:10 -07:00
14bb0faf0c Use chrootarchive for plugin rootfs
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6f3f907cdba0ba1aa4eb1320595d155bab3467af
Component: engine
2017-05-18 14:53:46 -07:00
0d783a82c9 Merge pull request #33267 from YuPengZTE/devImageWithDigestString
ineffectual assignment to isCanonical, delete it, and make the "if" sentence to fit the golang usage
Upstream-commit: b0dd3dfc1184b210854b62c231b7b074dd6dbd26
Component: engine
2017-05-18 23:37:52 +02:00