Commit Graph

36863 Commits

Author SHA1 Message Date
54ed530fdd Merge pull request #166 from andrewhsu/fix-plugin
[17.06] backport Make plugins dir private
2017-08-08 00:51:27 -07:00
d44a878765 Merge pull request #185 from fcrisciani/ln-vnd-17.06
[17.06] vndr libnetwork to latest bump_17.06
2017-08-07 23:59:31 -07:00
82e7ed09e3 Merge pull request #184 from thaJeztah/17.06-backport-containerd-event-handler-exit
[17.06] Fix when containerd restarted, event handler may exit
2017-08-07 23:57:05 -07:00
797ee59557 [17.06] vndr libnetwork to latest bump_17.06
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
2017-08-07 11:46:02 -07:00
db53a4b0a9 Fix when containerd restarted, event handler may exit
Description:
Kill docker-containerd continuously, and use kill -SIGUSR1 <dockerpid>
to check docker callstacks. And we will find that event
handler: startEventsMonitor or handleEventStream will exit.

This will only happen when system is busy, containerd need more time to
startup, and the monitor gorotine maybe exit.

Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com>
(cherry picked from commit 02ce73f62e73e78a4ec29b29fb2ba552221fe885)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-05 17:55:24 +02:00
87a7a648df Merge pull request #165 from andrewhsu/ln2
re-vndr engine's libnetwork to bump_17.06.0 again
v17.06.1-ce-rc3
2017-08-02 18:16:09 -07:00
afe2c1b4bc Make plugins dir private.
This prevents mounts in the plugins dir from leaking into other
namespaces which can prevent removal (`device or resource busy`),
particularly on older kernels.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 0c2821d6f2de692d105e50a399daa65169697cca)

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-02 18:05:13 -07:00
9b2a406435 Merge pull request #161 from alexmavr/backport-cli#362-17.06
[17.06] backport Skip inspect of built-in networks on stack deploy
2017-08-02 17:39:50 -07:00
2a1db025ff re-vndr components/cli/vendor/github.com/docker/docker from
components/engine

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-02 17:26:39 -07:00
7cd7d0794f re-vndr engine's libnetwork to bump_17.06.0 again
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-02 17:08:02 -07:00
07c249a12a Skip inspects of built-in networks on stack deploy
(cherry picked from commit 7f53c99dfe)
Signed-off-by: Alex Mavrogiannis <alex.mavrogiannis@docker.com>
2017-08-02 14:50:39 -07:00
344dbf919d Merge pull request #162 from cpuguy83/lock_container_on_network_connect
[17.06] backport fix for lock container while connecting to a new network
2017-08-02 14:39:17 -07:00
aa4e506101 Merge pull request #158 from swernli/applyingReleasableLayerFix
[17.06] Fixing releaseableLayer handling of layer streams and mounts.
2017-08-02 14:07:38 -07:00
8738f29e5b Merge pull request #164 from seemethere/cherry_pick_static_file_hashing_commits
[17.06] Move the hashing of files to its own target
2017-08-02 13:07:35 -07:00
939ee76a3f Move the hashing of files to its own target
So we can use it at will

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 533a843393bd7c3674074ec9af73c8e666fc7484)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-08-02 12:51:46 -07:00
271aa92890 Lock container while connecting to a new network.
`ConnectToNetwork` is modfying the container but is not locking the
object.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 4d0888e32bccfd8c0f27a7b66b2a5607d42e2698)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-08-02 15:14:36 -04:00
9df8f75ba9 Merge pull request #160 from seemethere/increment_170601rc3
[17.06.1] bump version to 17.06.1-ce-rc3
2017-08-02 09:43:05 -07:00
37ac42fbad Merge pull request #159 from seemethere/update_changelog_17061_ce_rc3
[17.06.1] Update changelog for 17.06.1-ce-rc3
2017-08-02 09:42:37 -07:00
f2d5210861 update changelog
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-02 09:29:52 -07:00
1282b9439c Merge pull request #148 from tiborvass/fix-vendor
Add top-level `make vendor` and run it.
2017-08-02 00:16:10 -07:00
7ddc25ce47 Merge pull request #157 from andrewhsu/ln
re-vndr libnetwork to latest on bump_17.06.0 branch
2017-08-01 20:28:56 -07:00
07ba784b1a Update changelog for 17.06.1-ce-rc3
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Signed-off-by: Eli Uriegas <seemethere101@gmail.com>
2017-08-01 19:35:19 -07:00
2e360495e8 Merge pull request #154 from thaJeztah/17.06-backport-prune-until-filter
[17.06] Error if "until" filter is combined with "--volumes" on system prune
2017-08-01 19:11:04 -07:00
6345212aa2 Merge pull request #149 from trapier/docker-user-iptables-changelog-addintion
[17.06] Docker user iptables changelog addition
2017-08-01 19:03:06 -07:00
983100a0e3 Merge pull request #156 from thaJeztah/17.06-fix-swagger-default-value
[17.06.1] Fix RestartPolicy default value
2017-08-01 19:00:14 -07:00
60340beefd Fixing releaseableLayer handling of layer streams and mounts.
Original PR message:
releaseableLayer includes automatic handling for creating a read/write layer and mounting it on a call to Mount(), but then does not correspondingly unmount the layer before trying to delete it, which will fail for some graphdrivers. Commit on a releaseable layer also leaks the tarstream for the layer. To fix this, the stream close is deferred in Commit and releaseRWLayer now correctly handles unmounting the layer before trying to delete it.  In addition, the changes include better error handling in Release() to make sure that errors are returned to the caller for failures on read/write layers instead of being ignored.# Please enter the commit message for your changes. Lines starting
Cherry-Pick note:
This version of the change was edited to merge with docker-ce 17.06, which did not include the releasableLayer.Commit code, requiring that part of the merge to be removed.
(cherry picked from commit 1d457999c4540aacda68f834bdb3c6f220ce3fd5)
Signed-off-by: Stefan Wernli <swernli@ntdev.microsoft.com>
2017-08-01 20:37:38 -04:00
8dcb831f11 re-vndr libnetwork to latest on bump_17.06.0 branch
vndr github.com/docker/libnetwork

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-01 17:30:13 -07:00
7d230371d9 bump version to 17.06.1-ce-rc3
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-08-01 17:02:12 -07:00
2b8fb89ff3 Merge pull request #150 from abhinandanpb/predefinednet
[17.06] Changing get network request to return predefined network in swarm
2017-08-01 11:09:10 -07:00
dbe03d4016 Changing the get network request to return swarm scope predefined networks
Starting 17.06 swarm service create supports service creates with predefined
networks like host and bridge. Due to the nature of the feature, swarm manager
has a swarm scope predefined networks in addition to local scoped
predefined networks on all nodes. However network inspects for swarm scoped
predefined networks was not possible. The fix adds support for network inspect
for swarm scoped predefined networks.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
(cherry picked from commit 5bfefb2d3662fa066ddf0d0e10cac93ee70f7ae8)
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-01 08:45:51 -07:00
08b100f7a1 Fix RestartPolicy default value
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit fc48b5529dca3907ade273921a14906be796e333)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-01 17:06:21 +02:00
ac0d111d0e Error if "until" filter is combined with "--volumes" on system prune
The "until" filter is supported by all object types, except for
volumes.

Before this patch, the "until" filter would attempted to be used for the volume
prune endpoint, resulting in an error being returned by the daemon, and
further prune endpoints (networks, images) to be skipped.

    $ docker system prune --filter until=24h --filter label=label.foo=bar

    WARNING! This will remove:
            - all stopped containers
            - all volumes not used by at least one container
            - all networks not used by at least one container
            - all dangling images
    Are you sure you want to continue? [y/N] y
    Error response from daemon: Invalid filter 'until'

    Calling POST /v1.30/containers/prune?filters=%7B%22label%22%3A%7B%22label.foo%3D%3Dbar%22%3Atrue%7D%2C%22until%22%3A%7B%2224h%22%3Atrue%7D%7D
    Calling POST /v1.30/volumes/prune?filters=%7B%22label%22%3A%7B%22label.foo%3D%3Dbar%22%3Atrue%7D%2C%22until%22%3A%7B%2224h%22%3Atrue%7D%7D
    Handler for POST /v1.30/volumes/prune returned error: Invalid filter 'until'
    Error response from daemon: Invalid filter 'until'

With this patch, an error is produced instead, preventing "partial" prune.

    $ docker system prune --filter until=24h --filter label=foo==bar --volumes
    ERROR: The "until" filter is not supported with "--volumes"

Note that `docker volume prune` does not have this problem, and produces an
error if the `until` filter is used;

    $ docker volume prune --filter until=24h

    WARNING! This will remove all volumes not used by at least one container.
    Are you sure you want to continue? [y/N] y
    Error response from daemon: Invalid filter 'until'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3c095dc546)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-01 16:13:54 +02:00
fd33a51310 Merge pull request #151 from thaJeztah/backport-fix-awslogs
[17.06.1] Fix awslogs driver repeating last event - #34292
2017-07-31 20:20:45 -07:00
ce7517d9a3 Fix awslogs driver repeating last event - #34292
Signed-off-by: Justin Menga <justin.menga@gmail.com>
(cherry picked from commit 0fd5a0bab79f20f910cb7551ec34158a32e05f5a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-01 01:01:35 +02:00
1473714177 Mention DOCKER-USER iptables chain in changelog
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2017-07-27 08:59:03 -04:00
ea04a0dd40 Run 'make vendor' to sync cli's vendored code with engine
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-07-27 03:07:38 +00:00
21205dab24 Add make vendor target
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-07-27 01:03:05 +00:00
96d84243ab Merge pull request #147 from seemethere/increment_170601rc2
bump version to 17.06.1-ce-rc2
v17.06.1-ce-rc2
2017-07-26 17:46:11 -07:00
fc2a71dc69 Merge pull request #129 from vieux/17.06-changelog
[17.06] Changelog
2017-07-26 17:45:43 -07:00
fb93aa0718 Merge pull request #130 from andrewhsu/fix-state-exit
[17.06] Set unpaused state when receiving 'stateExit' event
2017-07-26 17:00:19 -07:00
d5cbd105be bump version to 17.06.1-ce-rc2
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-07-26 16:51:15 -07:00
9666bdf780 update changelog
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-07-26 16:27:58 -07:00
eafd4433aa Merge pull request #133 from thaJeztah/cli-docs-cherry-picks
[17.06] CLI reference docs cherry-picks (and 1 completion fix)
2017-07-26 16:18:23 -07:00
903138e5fc Merge pull request #142 from cpuguy83/cherry-pick-33960
[17.06] Fix error handling with not-exist errors on remove
2017-07-26 16:18:06 -07:00
fcc60a6e76 Merge pull request #144 from aaronlehmann/backport-34235
[17.06] cluster: Avoid recursive RLock
2017-07-26 16:17:12 -07:00
96bbcbffdc Merge pull request #134 from cyli/re-vendor-swarmkit
[17.06] Re-vendor swarmkit for various fixes
2017-07-26 16:11:21 -07:00
69c6f58011 Merge pull request #145 from andrewhsu/fix-tar-archive
[17.06] backport Fix tar prefix header
2017-07-26 16:07:41 -07:00
eb669c3130 Merge pull request #135 from thaJeztah/completion-cherry-picks
[17.06] Completion cherry picks
2017-07-26 15:00:12 -07:00
366839a5ac Keep pause state when restoring container's status
Do not change pause state when restoring container's
status, or status in docker will be different with
status in runc.

Signed-off-by: Fengtu Wang <wangfengtu@huawei.com>
(cherry picked from commit 977c4046fd2147d7c04f4b513a94138013ca0dd6)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-26 14:39:46 -07:00
b6df63d5f6 Fix error handling with not-exist errors on remove
Specifically, none of the graphdrivers are supposed to return a
not-exist type of error on remove (or at least that's how they are
currently handled).

Found that AUFS still had one case where a not-exist error could escape,
when checking if the directory is mounted we call a `Statfs` on the
path.

This fixes AUFS to not return an error in this case, but also
double-checks at the daemon level on layer remove that the error is not
a `not-exist` type of error.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit d42dbdd3d48d0134f8bba7ead92a7067791dffab)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-07-26 16:41:40 -04:00