4b2490c791
Add API test to rotate the swarm CA certificate
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 376c75d13cedd22c578197a140ffc10e27e84d01
Component: engine
2017-05-11 11:13:14 -07:00
59422fa37f
Update the stream formatter to display custom unit numbers.
...
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: a771c16834c92cb39142078c64e253423f0fb4e3
Component: engine
2017-05-11 11:13:11 -07:00
dbf4ba7522
Propagate the desired CA certificate and CAConfig ForceRotate parameter
...
in the Docker REST APIs when viewing or updating the swarm spec info, and
also propagate the desired CA key in the Docker REST APIs when updating
swarm spec info only (it is not available for viewing).
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 1847bb899a07d3dd324e75a3ed9b3489fcfc302f
Component: engine
2017-05-11 10:22:42 -07:00
619aeaa2ea
Merge pull request #32127 from ripcurld0/redirect_go18
...
Return error on client redirect
Upstream-commit: e3a30ffca68742c6569a26fd01a86da03f4f8aeb
Component: engine
2017-05-11 12:48:56 -04:00
2c6473821e
Merge pull request #33054 from dnephin/refactor-builder-named-contexts-interface
...
[Builder] Expose GetImage interface for builder
Upstream-commit: 974cec945b80bc0004f3917ec318c15e9c038e4a
Component: engine
2017-05-11 11:03:30 -04:00
9d2b3f6463
Return error on client redirect
...
From Go 1.8 HTTP client redirect behaviour is changed:
When status code is 301, 307 or 308, the client
automatically converts it to a new HTTP request.
This behaviour change manifests in the client in that
before the 301 was not followed and the client did not generate
an error, but now results in an error message:
"Error response from daemon: page not found."
To fix that a new redirect policy is forced by setting
HTTP Client's CheckRedirect.
That policy is to return an error for any 301, 307 or 308
in the response's status code to a non-GET request.
The error message specifies that the daemon could not
process the request and it is probably due to bad
arguments that were provided by the user.
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: eb36d6021618f788012c166a533f1b321cda9695
Component: engine
2017-05-11 15:39:41 +03:00
cfa3cb0b21
Merge pull request #32906 from fcrisciani/init_race_cond
...
Race condition fix for swarm join/leave
Upstream-commit: 77d5a0996f0e007330424ea4740e908fd887cf37
Component: engine
2017-05-11 05:18:40 -07:00
4a4d032afd
Merge pull request #29030 from cpuguy83/go18_test
...
Update go to 1.8
Upstream-commit: ff86a9196bbb5a0410782f9171699680409c9465
Component: engine
2017-05-11 05:18:12 -07:00
9145e727fb
Merge pull request #33147 from nishanttotla/docs-update-distribution-json-endpoint
...
Updating API Changelog to add /distribution/{name}/json endpoint
Upstream-commit: 1f55b71ff904e7c20fee6b4018ba5115749a249c
Component: engine
2017-05-11 12:16:43 +02:00
cb4ffe6d3e
Updating API Changelog to add /distribution/{name}/json endpoint
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a89dd03c26885bb69450b28f10ef002cde0dadb7
Component: engine
2017-05-11 12:15:00 +02:00
1469dbf703
Libnetwork vendoring
...
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 385176980ef6c6f322c78d76bd2f98875e6aee69
Component: engine
2017-05-10 21:16:57 -07:00
eaff058a53
Fix race condition between swarm and libnetwork
...
This commit in conjunction with a libnetwork side commit,
cleans up the libnetwork SetClusterProvider logic interaction.
The previous code was inducing libnetwork to spawn several go
routines that were racing between each other during the agent
init and close.
A test got added to verify that back to back swarm init and leave
are properly processed and not raise crashes
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: e2ec006797fa14f59bcf7b9c23505ccdf1d3ded3
Component: engine
2017-05-10 21:16:52 -07:00
c8c0bf9d2e
Merge pull request #33100 from fcrisciani/memberlist_version
...
Libnetwork vendoring
Upstream-commit: 2ca41c47c4a0e430267f960836ab182964557fdb
Component: engine
2017-05-10 21:09:38 -07:00
5065cd9576
Merge pull request #33044 from albers/completion-dm-storage-opts
...
Add bash completion for new devicemapper storage options
Upstream-commit: 71d29266ff4f3bb3f43d6c50b115abf20cd02879
Component: engine
2017-05-10 17:59:56 -07:00
3bffce1905
fix tests after CLI update
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 73e2f55543346b285585f350e53f82ae419f8849
Component: engine
2017-05-10 20:09:50 -04:00
fd866433a8
Update docker/cli commit
...
Contains fixes required for go1.8.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 51bca5c406c57f01e06997c07686c874156cfe38
Component: engine
2017-05-10 20:09:50 -04:00
c9bef385b2
Update golang to 1.8
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 470dfd69b3a86d8966f51d3f7237bdb10d6e00e0
Component: engine
2017-05-10 20:06:27 -04:00
c1ba295763
Merge pull request #32875 from cyli/root-ca-info-in-api
...
Propagate TLS Info in swarm info and node info REST endpoints
Upstream-commit: f02a5b50c407bdb087388e18e1ac619f2788dd8d
Component: engine
2017-05-11 00:35:46 +02:00
df464dbe2f
Refactor imageContexts into two different structs.
...
buildStages now tracks the imageID and runConfig for a build stage
imageMounter tracks image mounts so they can released when the build ends.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6c28e8edd5f047d5b1438f773d49882f28d7a006
Component: engine
2017-05-10 17:59:30 -04:00
01b4a22798
Refactor interaction between dispatcher.from and dispatchState
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ab3a037a5b77220d0524ce2b17105e1daae39425
Component: engine
2017-05-10 17:58:57 -04:00
e526b1e1d8
Expose a smaller interface for the Builder retrieving images from daemon
...
Removes 3 methods from the builder.Backend interface
Remove the coupling between imageContexts, imageMounts and the builder.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b3bc7b28d09138a37ab5476eb46dfe74f8984f18
Component: engine
2017-05-10 17:58:57 -04:00
a27f8db366
Merge pull request #33090 from tonistiigi/fix-release-mounts
...
builder: Fix releasing implicit mounts
Upstream-commit: a3eebaf50937c715936480a1ef46577b0df8b686
Component: engine
2017-05-10 14:46:58 -07:00
89f4e9426e
Merge pull request #32061 from nishanttotla/engine-api-manifest
...
Adding Docker API endpoint to inspect image manifest
Upstream-commit: 28d428f4ec3ae218f9466d69ad7d0f53c1f3575b
Component: engine
2017-05-10 23:43:30 +02:00
dc91a6dbf3
Merge pull request #33139 from stevvooe/remove-unused-functions
...
pkg/ioutils: remove unused functions
Upstream-commit: e8c2a33b747ac1f69d3992a47844abf1d7f58910
Component: engine
2017-05-10 16:48:14 -04:00
4f4a20dea3
Merge pull request #33128 from crosbymichael/update-containerd-2x
...
Update containerd for terminal updates
Upstream-commit: a46f7bd5bd5d1a0d5593034fc540193ef7ed3644
Component: engine
2017-05-10 16:45:11 -04:00
48c2d44c30
Merge pull request #32571 from ehazlett/secret-targets
...
Support Custom Secret Targets
Upstream-commit: 08fdce773899d68a9bebc952f85c98f9106978e2
Component: engine
2017-05-10 16:26:35 -04:00
2bc4204935
Propagate the swarm cluster and node TLS info provided by the swarm
...
objects into the REST API responses. In the CLI, display only
whether the nodes' TLS info matches the cluster's TLS info, or
whether the node needs cert rotation.
Signed-off-by: Ying Li <ying.li@docker.com >
Upstream-commit: 64cccedbce86542fc9289ad9cca1dd758f2f21c2
Component: engine
2017-05-10 11:29:17 -07:00
817f36020a
Adding example to /distribution/{name}/json endpoint swagger spec
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 4a812040eb14a8e2a6aeeb7686d19e8ef81f29cd
Component: engine
2017-05-10 11:20:03 -07:00
68f498df11
Extend test coverage of secrets
...
Actually look inside the container to see if the secret data is present
and correct. Test absolute paths, relative paths, and just a basename.
Test the scenario where a service references the same secret under
different targets.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 0da7bd0314a61919428fe036660b822b0bf22d35
Component: engine
2017-05-10 10:23:10 -07:00
a4b52b68b5
Use forked version of CLI for tests
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 47a17c211d54da80a26ebdd6eb59ffe1a004b997
Component: engine
2017-05-10 10:23:10 -07:00
675654a603
Use "local" secret paths based on the secretID
...
This prevents targets with the same basename from colliding.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 37ce91ddd60e50a8bcd7ac3a7ba858f94c28c51e
Component: engine
2017-05-10 10:23:09 -07:00
4764bfe1f6
support custom paths for secrets
...
This adds support to specify custom container paths for secrets.
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
Upstream-commit: 67d282a5c95ca1d25cd4e9c688e89191f662d448
Component: engine
2017-05-10 10:23:07 -07:00
307e8be5eb
Merge pull request #33141 from vieux/update_builder
...
fix builder report url
Upstream-commit: f4349a77fdaff6198fb6b14398747543b2a134a8
Component: engine
2017-05-10 10:15:25 -07:00
220caf6377
fix report url
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 890f02190211543001cab77958ba589cc39d75d2
Component: engine
2017-05-10 10:14:18 -07:00
6194db61a4
Merge pull request #33129 from vieux/builder-report-2017-05-07
...
Add dev report for may 8th
Upstream-commit: 4836b0ab8573dd1627ba0847792356bcb5c64334
Component: engine
2017-05-10 09:25:24 -07:00
f6fd5c02a5
Add dev report for may 8th
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 1397a4981103c290e095eb9ef8ac822c80d8a758
Component: engine
2017-05-10 09:11:07 -07:00
6c60a4412d
Merge pull request #33057 from dmcgowan/windows-download-descriptor
...
Use diff ids from image configuration
Upstream-commit: 6efdac4291bfb2eec1360991596e93707287275c
Component: engine
2017-05-10 11:36:19 -04:00
9e5ba6cea7
pkg/ioutils: remove unused functions
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: c546894aefbd661adc73ba3cf952d38f94627924
Component: engine
2017-05-10 08:34:16 -07:00
781f9bd6c3
Merge pull request #33087 from Microsoft/jjh/blockreadonly
...
Windows: Block read-only
Upstream-commit: 6e0e283387e78c912d7ae482d333d3b81e003bf8
Component: engine
2017-05-10 17:21:33 +02:00
77dd0ffa1e
Merge pull request #33137 from albers/docs-report-link
...
Fix link in dev report
Upstream-commit: 46f5d7e32543eb30e0db300844a1b19db971cf86
Component: engine
2017-05-10 16:13:30 +02:00
83279055ee
Merge pull request #33045 from albers/completion--health-start-period
...
Add bash completion for `--health-start-period`
Upstream-commit: 2a7a938da42d5e522c3bdd455c5eb936dcc8f0df
Component: engine
2017-05-10 15:54:43 +02:00
8a277c8d39
Fix link in dev report
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 94d3758487a45b31037a608fe070061aef5cd2df
Component: engine
2017-05-10 15:36:43 +02:00
4d8c6f2827
Merge pull request #31012 from cpuguy83/do_not_remove_containers_on_error
...
Do not remove containers from memory on error
Upstream-commit: 815e8bb885c3d9f70ab763d9844e857590b40ad3
Component: engine
2017-05-10 06:21:28 -04:00
f04e158c49
Merge pull request #33114 from dnephin/fix-builder-warn-on-unused-builtint
...
Fix warning for unused build args
Upstream-commit: 22a03192fbf10f583003135421fcbc72c38f1ee4
Component: engine
2017-05-10 09:38:07 +02:00
3cfa1e91a7
Merge pull request #33094 from darrenstahlmsft/RevendorGoWinio
...
Update go-winio to v0.4.0 (go 1.8.x works on Windows)
Upstream-commit: 80bb6a46a33d0396b3a8b15dc8c0ad81e05682b6
Component: engine
2017-05-09 22:46:31 -07:00
88971970c1
Merge pull request #33123 from johnstep/windows-respect-client-repo
...
Update make.ps1 to respect client repo
Upstream-commit: c68612de0cb526bdcec20a9708c241284468942c
Component: engine
2017-05-09 19:03:50 -07:00
d781af028f
Update go-winio to v0.4.0
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 24d41778595722d2d318eba45d9e723aaa918b20
Component: engine
2017-05-09 17:49:55 -07:00
34899cbe9c
/distribution/{name}/json returns full Descriptor object
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 12e232ee35b56cb2954c48d83ec9febb40cdeb90
Component: engine
2017-05-09 17:25:27 -07:00
8a31debf44
Add OPOST back to !cgo build for pkg/term
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 270a33b666ff9a1b3925c5cf53c336b6fab20dc3
Component: engine
2017-05-09 16:36:17 -07:00
b4be63f0ee
Merge pull request #33089 from Microsoft/jjh/hccsshimv0.5.16
...
Revendor Microsoft\hcsshim @ v0.5.17
Upstream-commit: d1a7ea147c92c296dea9ff9de077afafd9222eb0
Component: engine
2017-05-09 19:21:20 -04:00
