Commit Graph

36896 Commits

Author SHA1 Message Date
34d73cd0d8 Merge pull request #206 from andrewhsu/rc1
[17.06] bump version to 17.06.2-ce-rc1
v17.06.2-ce-rc1
2017-08-28 11:52:32 -07:00
e31c8d8a5c Merge pull request #205 from andrewhsu/cl-rc1
[17.06] update changelog for 17.06.2-ce-rc1 release
2017-08-28 11:52:12 -07:00
6e39a2cb71 update changelog for 17.06.2-ce-rc1 release
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-28 11:50:10 -07:00
638a87493e Merge pull request #208 from andrewhsu/fix-pullopts
[17.06] vndr swarmkit to bring in fix for PullOptions
2017-08-28 10:05:48 -07:00
5f8026ab88 vndr swarmkit to bring in fix for PullOptions
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-25 11:29:33 -07:00
6988f4f23f Merge pull request #200 from vieux/fix-dm-cookie
[17.06] devmapper: ensure that UdevWait is called after calls to setCookie
2017-08-23 16:31:25 -07:00
896a9ffc6b Merge pull request #201 from andrewhsu/fix-diff-path
[17.06] backport fix for removing diff path
2017-08-22 22:35:27 -07:00
6c44271690 Merge pull request #167 from thaJeztah/17.06-backport-keep-alive
[17.06] backport "Enable TCP Keep-Alive in Docker client"
2017-08-22 15:47:30 -07:00
7294ad7f3c bump version to 17.06.2-ce-rc1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-22 15:35:14 -07:00
4661389bd3 Fix error removing diff path
In d42dbdd3d48d0134f8bba7ead92a7067791dffab the code was re-arranged to
better report errors, and ignore non-errors.
In doing so we removed a deferred remove of the AUFS diff path, but did
not replace it with a non-deferred one.

This fixes the issue and makes the code a bit more readable.

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

Conflicts:
	components/engine/daemon/graphdriver/aufs/aufs.go

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-22 11:47:42 -07:00
d25b1a3913 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>
(cherry picked from commit 23dcfec1404411489e23fb9b76fc7096db139d04)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-08-17 15:54:52 -07:00
874a7374f3 Merge pull request #198 from andrewhsu/ga
[17.06] bump version to 17.06.1-ce
v17.06.1-ce
2017-08-17 14:18:05 -07:00
d7fe3fc7eb Merge pull request #199 from andrewhsu/cl
[17.06] update changelog for docker-ce 17.06.1
2017-08-17 14:17:47 -07:00
6b2e31a753 update changelog for docker-ce 17.06.1
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-17 11:31:01 -07:00
29d9279ad4 bump version to 17.06.1-ce
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-17 10:56:19 -07:00
99a27323fe Merge pull request #197 from andrewhsu/ven-ln
[17.06] vndr libnetwork to bring in fix for overlay network ip reuse
2017-08-17 10:46:27 -07:00
4770c7af51 vndr libnetwork to bring in fix for overlay network ip reuse
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-16 21:22:27 -07:00
0a33916f54 Merge pull request #187 from andrewhsu/rc4
bump version to 17.06.1-ce-rc4
v17.06.1-ce-rc4
2017-08-08 01:12:26 -07:00
904cba3a81 bump version to 17.06.1-ce-rc4
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-08-08 01:10:31 -07:00
c1e16c7489 Merge pull request #179 from thaJeztah/17.06-backport-fix_api_server_null
[17.06] Fix api server null pointer def on inspect/ls null ipam-driver networks
2017-08-08 01:08:24 -07:00
d4e48884dd Merge pull request #171 from thaJeztah/17.06-backport-dont-remove-unsupported-resources
[17.06] backport "Don't attempt to remove unsupported resources on older daemon"
2017-08-08 00:59:44 -07:00
df3f5ebc1e Merge pull request #169 from thaJeztah/17.06-docs-cherry-picks
[17.06] docs cherry picks
2017-08-08 00:55:52 -07:00
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
280ee18747 Fix api server null pointer def on inspect/ls null ipam-driver networks
- When a network is created with the null ipam driver, docker api server
  thread will deference a nil pointer on `docker network ls` and on
  `docker network inspect <nw>`. This because buildIpamResource()
  assumes a gateway address is always present, which is not correct.

Signed-off-by: Alessandro Boch <aboch@tetrationanalytics.com>
(cherry picked from commit beebfc0cf6240c8af511eb4d7e29314c8de6ddf2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-04 13:33:08 +02:00
a703a55a77 Don't attempt to remove unsupported resources on older daemon
When running `docker stack rm <some stack>` against an older daemon,
a warning was printed for "configs" being ignored;

    WARNING: ignoring "configs" (requires API version 1.30, but the Docker daemon API version is 1.26)

Given that an old daemon cannot _have_ configs, there should not be
a need to warn, or _attempt_ to remove these resources.

This patch removes the warning, and skips fetching (and removing)
configs.

A check if _secrets_ are supported by the daemon is also added,
given that this would result in an error when attempted against
an older (pre 1.13) daemon.

There is one situation where this could lead to secrets or
configs being left behind; if the client is connecting to a
daemon that _does_ support secrets, configs, but the API version
is overridden using `DOCKER_API_VERSION`, no warning is printed,
and secrets and configs are not attempted to be removed.

Given that `DOCKER_API_VERSION` is regarded a feature for
debugging / "power users", it should be ok to ignore this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2429f15672)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-04 02:40:18 +02:00
5dbe00ec7c Fix stream for 'nothing found in stack' message
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit fb6deb1077)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-04 02:40:09 +02:00
6082f71f15 add unit tests to stack package
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
(cherry picked from commit 535af2d868)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-04 02:39:57 +02:00
8e0f32c269 Add a line break after warning 👼
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit b7fad8f1dc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-04 02:26:12 +02:00
2867d1282c Update API plugin response examples
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4735c7663201ce1bf618e2aa505d7813a331be3f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-03 22:13:06 +02:00
7f68e988e4 Add Infinit plugin
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 83e8551876)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-03 22:12:32 +02:00
292eac64d7 update service create and update options in commandline documentation
Signed-off-by: zebrilee <zebrilee@gmail.com>
(cherry picked from commit 5fe09164f5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-03 22:12:25 +02:00
1930711f45 modify foo by container in order to clarify the documentation
Signed-off-by: zebrilee <zebrilee@gmail.com>
(cherry picked from commit 2d5f9d83e7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-03 22:12:17 +02:00
c1503b058d Docs: update filter options for docker container ps
The `is-task` filter was only documented in the usage
section, but this section is not used in the documentation.

This patch adds the missing filter, synchronises the
man page source, and does some slight rephrasing
and reformatting of the filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 46064f33f4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-03 22:12:08 +02:00
08552809a0 Enable TCP Keep-Alive in Docker client
Some network environments may have NATs, proxies, or gateways which
kill idle connections. There are many Docker API operations which may
be idle for long periods of time (such as ContainerWait and ContainerAttach)
and may result in unexpected connection closures or hangs if TCP keepalives
are not used.

This patch updates the default HTTP transport used by the Docker client
package to enable TCP Keep-Alive with a keep-alive interval of 30 seconds.
It also sets a connect timeout of 30 seconds.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)

(cherry picked from commit 2831a04cba)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-08-03 21:32:17 +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