Commit Graph

40315 Commits

Author SHA1 Message Date
9ee9f402cd Merge pull request #75 from andrewhsu/v3
[18.03] bump version to 18.03.1-ce
v18.03.1-ce
2018-04-25 21:27:49 -07:00
c32349b9a9 Merge pull request #77 from andrewhsu/c3
[18.03] update changelog for 18.03.1-ce
2018-04-25 21:27:33 -07:00
6d0d01b238 Merge pull request #74 from andrewhsu/c03
[18.03] vndr hcsshim to 79062a5
2018-04-25 17:51:37 -07:00
fda40de70c update changelog for 18.03.1-ce
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-04-26 00:22:09 +00:00
fdb8850492 bump version to 18.03.1-ce
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-04-26 00:15:38 +00:00
56e55727a8 vndr hcsshim to 79062a5
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-04-25 22:09:31 +00:00
fcdc984cfd Merge pull request #517 from jose-bigio/18.03_version_bump
[18.03] version bump to 18.03.1-ce-rc2
v18.03.1-ce-rc2
2018-04-18 23:23:53 -07:00
8921f8bec1 Merge pull request #518 from jose-bigio/18.03_changelog
[18.03] Update changelog for 18.03.1
2018-04-18 23:23:35 -07:00
6f1fe53965 fixup changelog
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-04-19 06:22:38 +00:00
af03317180 Merge pull request #507 from thaJeztah/18.03-backport-plugin_exec_fixes
[18.03] Make sure plugin container is removed on failure
2018-04-18 21:53:37 -07:00
76cbc5d636 Merge pull request #509 from cpuguy83/18.03_backport_authz_buffer_fix_36595
[18.03] backport authz buffer fix
2018-04-18 20:42:44 -07:00
14b513f77d Merge pull request #520 from thaJeztah/18.03-backport-libcontainerd_client_locking
[18.03] Relax global client lock on containerd restore.
2018-04-18 20:35:00 -07:00
a78f916dfb Add more updates for 18.03.1-ce
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2018-04-19 00:25:35 +00:00
be3f367578 Merge pull request #515 from thaJeztah/18.03-backport-election
[18.03] Increase raft ElectionTick to 10xHeartbeatTick
2018-04-18 17:01:37 -07:00
db5f5c037d Merge pull request #516 from thaJeztah/18.03-backport-booo
[18.03] Don't make container mount unbindable
2018-04-18 17:01:03 -07:00
905f71561a Relax global client lock on containerd restore.
This unblocks the client to take other restore requests and makes sure
that a long/stuck request can't block the client forever.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 806700e410a1b30aa1033d71d825e57880c75298)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 16:49:38 -07:00
60dc869e44 Limit authz response buffer
When the authz response buffer limit is hit, perform a flush.
This prevents excessive buffer sizes, especially on large responses
(e.g. `/containers/<id>/archive` or `/containers/<id>/export`).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 74f8e47352e71aad4015d8d9dea8f16e7a055863)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 16:27:50 -07:00
ce2f874741 Make sure plugin container is removed on failure
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit f81172b9031160218e51fb2a7dbeee19962a60a9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 16:24:51 -07:00
e79a05793b Merge pull request #513 from thaJeztah/18.03-backport-test-improvements
[18.03] Updates to integration tests, migrate to "gotestyourself"
2018-04-18 16:19:12 -07:00
4fd6bf8c4a Merge pull request #514 from thaJeztah/18.03-bump-libnetwork
[18.03] Update libnetwork
2018-04-18 15:44:33 -07:00
3d5ce4f418 Merge pull request #477 from thaJeztah/18.03-distribution-cache
[18.03] fix(distribution): digest cache should not be moved if it was an auth error
2018-04-18 15:27:38 -07:00
edee73b51b Merge pull request #511 from thaJeztah/18.03-backport-fix-stack-deploy-after-force
[18.03] Fix stack deploy re-deploying service after --force
2018-04-18 14:48:17 -07:00
02e93e419f Merge pull request #479 from thaJeztah/18.03-err_return
[18.03] Add missing error return for plugin creation.
2018-04-18 14:47:52 -07:00
68acf3c023 Merge pull request #468 from thaJeztah/18.03-do-not-panic
[18.03] ExportContainer: do not panic
2018-04-18 14:47:18 -07:00
b522d934b9 Merge pull request #498 from thaJeztah/18.03-backport-fix-version-output
[18.03] Fix docker version output alignment
2018-04-18 14:46:15 -07:00
029cfa0956 Merge pull request #519 from thaJeztah/18.03-backport-docs-fixes
[18.03] backport docs and completion fixes
2018-04-18 14:45:46 -07:00
da69d9e253 Add bash completion for secret|config create --template-driver
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 43024e2d57)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 10:18:01 -07:00
79e8ae0e9d docker load: Typofix in examples
Remove the double "docker docker" from example

Signed-off-by: Henry Ne <henrynmail-github@yahoo.de>
(cherry picked from commit 79c489d812)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 10:17:55 -07:00
39f7e7efd0 build.md: Document --build-arg without value
This use case is currently _working correctly_, which is nice, but there is no documentation to be found about it. This PR fixes that.

Signed-off-by: Per Lundberg <perlun@gmail.com>
(cherry picked from commit 82c23208ee)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 10:17:50 -07:00
766c24e554 Update examples to reflect docker-runc's runtime root for plugins.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
(cherry picked from commit 5fd9eab3d0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 10:17:44 -07:00
4e72a2fd51 Fix --format example for docker history
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2f7bf40e73)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 10:17:39 -07:00
24306165c5 Use printf, not echo when creating secrets
Update the docs so that users don't use `echo` when creating
secrets from STDIN. `echo` adds a trailing new line, so users
will probably be confused when their passwords don't work.

Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
(cherry picked from commit 5238f3e93e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 10:17:33 -07:00
27540de1ad Update build.md
Explicitly stated that you must add --build-arg for each build argument.
Added multiple arguments to example of `--build-arg` usage.
Fix for https://github.com/docker/docker.github.io/issues/6248

Signed-off-by: Preston Cowley <cowlinator@gmail.com>
(cherry picked from commit ad44e2d45e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 10:17:26 -07:00
1df656a2f0 Clarify behaviour of restart policy in run ref doc
This clarifies that the behaviour of `unless-stopped` will restart the container on daemon start.  This was implied before, but now the restart-on-daemon-start behaviour is mentioned directly.

Signed-off-by: David Beitey <david@davidjb.com>
(cherry picked from commit 8ca237054f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 10:17:18 -07:00
bb68afd0fc Docs touch-ups for "autoremove" and broken anchor
`--rm` moved to the daemon, so is now also supported
when combined with `-d`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e9ce688d6e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-18 10:17:11 -07:00
35fc88bcd9 Update changelog for 18.03.1
Signed-off-by: jose-bigio <jose.bigio@docker.com>
2018-04-18 09:51:43 -07:00
b45862f481 Version bum to 18.03.1-ce-rc2
Signed-off-by: jose-bigio <jose.bigio@docker.com>
2018-04-18 09:17:16 -07:00
72f31848f8 Don't make container mount unbindable
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 4c000662feb3c8e3d63cbcb044a47f627cd9bb45)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 23:55:02 -07:00
0e66a94980 Increase raft ElectionTick to 10xHeartbeatTick
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
(cherry picked from commit 6abee2008b314a65553202b15d9a333d171e3433)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 23:43:11 -07:00
85143bcb4d Bump libnetwork commit
Full diff
5c1218c956...c15b372ef2

Fixes a panic on concurrent read/write to a map.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 248aed5766ba330ab8cb2b10b03b6ce57dc64283)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 19:24:33 -07:00
a4b56ba187 update libnetwork to improve scalabiltiy of bridge network isolation rules
* libnetwork#2121: Retry other external DNS servers on ServFail
* libnetwork#2125: Fix README flag and expose orphan network peers
* libnetwork#2126: Adding goreport card
* libnetwork#2130: Modify awk to use cut in check_ip_overlap
* libnetwork#2117: [Carry 1534] Improve scalabiltiy of bridge network isolation rules

Full changes: 2bf63300c5...5c1218c956

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit b159da19734269c4a162763ebfa28dff07b703f3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 19:24:27 -07:00
5a884e1a0d Remove (now) extra call to sb.DisableService()
This call was added as part of commit a042e5a20 and at the time was
useful.  sandbox.DisableService() basically calls
endpoint.deleteServiceInfoFromCluster() for every endpoint in the
sandbox.  However, with the libnetwork change, endpoint.sbLeave()
invokes endpoint.deleteServiceInfoFromCluster(). The releaseNetwork()
call invokes sandbox.Delete() immediately after
sandbox.DisableService().  The sandbox.Delete() in turn ultimately
invokes endpoint.sbLeave() for every endpoint in the sandbox which thus
removes the endpoint's load balancing entry via
endpoint.deleteServiceInfoFromCluster().  So the call to
sandbox.DisableService() is now redundant.

It is noteworthy that, while redundant, the presence of the call would
not cause errors.  It would just be sub-optimal.  The DisableService()
call would cause libnetwork to down-weight the load balancing entries
while the call to sandbox.Delete() would cause it to remove the entries
immediately afterwards.  Aside from the wasted computation, the extra
call would also propagate an extra state change in the networkDB gossip
messages.  So, overall, it is much better to just avoid the extra
overhead.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
(cherry picked from commit c27417aa7de46daa415600b39fc8a9c411c8c493)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 19:24:20 -07:00
0fae0d5a40 Import libnetwork fix for rolling updates
This patch allows endpoints to complete servicing connections while
being removed from a service.  The fix is entirely within libnetwork
and requires no changes to the moby codebase proper.  It operates
by initially down-weighting a container endpoint in the load balancer
to 0 while keeping the endpoint present in the load balancer.  This
allows traffic to continue to flow to the endpoint while preventing new
connections from going to the endpoint.  This allows the container
to complete requests during the "stop_grace_period" and then exit when
finished without interruption of service.

This change requires propagating the status of disabled service
endpoints via the networkDB.  Accordingly, the patch includes both code
to generate and handle service update messages.  It also augments the
service structure with a ServiceDisabled boolean to convey whether an
endpoint should ultimately be removed or just disabled.  This,
naturally, required a rebuild of the protocol buffer code.

The protocol buffer encoding is designed to support additions of fields
to messages in a backwards-compatible manner.  Protocol buffer
unmarshalling code automatically skips past any fields that it isn't
aware of.  As a result, an older moby daemon without this fix can
receive and will process correctly networkDB messages from newer moby
daemons with this patch.

As it turns out, the additional field is simply a bool that is otherwise
irrelevent on networkDB create and delete events.  So its absence in
older moby daemon processing has no impact.  However, the fix leverages
the "update" networkDB message which was previously unused in
libnetwork.  Although older libnetwork implementations parse the message
cleanly, they will see the message as unexpected and as such issue a log
at error level indicating the receipt of such.

Other than this there should be no other negative impact for use of this
patch in mixed environments. (Although older mobys won't be able to
gracefully downgrade connections on their nodes of course.)

Signed-off-by: Chris Telfer <ctelfer@docker.com>
(cherry picked from commit 50dbdeff9fd186bb0e9926996436e1f56529a831)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 19:24:13 -07:00
608b278d01 Fix a misused network object name
A minor nit. `test01` never been created and used in
`TestDockerNetworkInspectCustomSpecified()` function, so correct it.

Signed-off-by: Dennis Chen <dennis.chen@arm.com>
(cherry picked from commit f041953d04bffa2be05466173f02dd016c68286d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 19:11:29 -07:00
faccf7d3a7 remove the retries for service update
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 7380935331f0c35315003578258f6c1f47c1a586)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 19:08:23 -07:00
04b5ed6c10 Migrate image tag tests from integration-cli to api tests
This fix migrates image tag tests from integration-cli to api tests.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 9bcb960508a6066811cffcca1e35ca44d7f1cf94)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 19:06:13 -07:00
7974841233 Move fakecontext, fakegit and fakestorage to internal/test
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 062564084a22f71cf5807ae5dfad7d29afb12e04)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 18:42:10 -07:00
f70c483990 Some enhancement in integration tests
This fix converts some `client.ContainerCreate` to `container.Create`,
and removes some unneeded `name` fields when test containers are created.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit ab9bb47b05b1dde445a5e4ba78ae97303208dc8b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 18:34:06 -07:00
49acaa1f03 Small daemon refactoring and add swarm init/join helpers
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 239a8a518904dfb51fe62087d8702519c20ce808)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 18:33:54 -07:00
09fa7b76b7 Migrate test-integration-cli experimental build tests to integration
All `docker build` tests that require an `ExperimentalDaemon` are
migrated to `integration/build` package and start an experimental
daemon to test on it.

The end goal being to remove the `experimental` builds.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 183076e89df64928bd2e94ad0da9725b482367cd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-04-17 18:33:46 -07:00