0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
32333 commits 14 branches 412 tags 338 MiB
Commit graph

32333 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ying Li
1847bb899a 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>
 2017-05-11 10:22:42 -07:00
Brian Goff
e3a30ffca6 Merge pull request #32127 from ripcurld0/redirect_go18 
Return error on client redirect
 2017-05-11 12:48:56 -04:00
Daniel Nephin
974cec945b Merge pull request #33054 from dnephin/refactor-builder-named-contexts-interface 
[Builder] Expose GetImage interface for builder
 2017-05-11 11:03:30 -04:00
Boaz Shuster
eb36d60216 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>
 2017-05-11 15:39:41 +03:00
Madhu Venugopal
77d5a0996f Merge pull request #32906 from fcrisciani/init_race_cond 
Race condition fix for swarm join/leave
 2017-05-11 05:18:40 -07:00
Madhu Venugopal
ff86a9196b Merge pull request #29030 from cpuguy83/go18_test 
Update go to 1.8
 2017-05-11 05:18:12 -07:00
Sebastiaan van Stijn
1f55b71ff9 Merge pull request #33147 from nishanttotla/docs-update-distribution-json-endpoint 
Updating API Changelog to add /distribution/{name}/json endpoint
 2017-05-11 12:16:43 +02:00
Nishant Totla
a89dd03c26
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>
 2017-05-11 12:15:00 +02:00
Flavio Crisciani
385176980e
Libnetwork vendoring 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-05-10 21:16:57 -07:00
Flavio Crisciani
e2ec006797
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>
 2017-05-10 21:16:52 -07:00
Madhu Venugopal
2ca41c47c4 Merge pull request #33100 from fcrisciani/memberlist_version 
Libnetwork vendoring
 2017-05-10 21:09:38 -07:00
Kenfe-Mickaël Laventure
71d29266ff Merge pull request #33044 from albers/completion-dm-storage-opts 
Add bash completion for new devicemapper storage options
 2017-05-10 17:59:56 -07:00
Brian Goff
73e2f55543 fix tests after CLI update 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-10 20:09:50 -04:00
Brian Goff
51bca5c406 Update docker/cli commit 
Contains fixes required for go1.8.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-10 20:09:50 -04:00
Brian Goff
470dfd69b3 Update golang to 1.8 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-10 20:06:27 -04:00
Sebastiaan van Stijn
f02a5b50c4 Merge pull request #32875 from cyli/root-ca-info-in-api 
Propagate TLS Info in swarm info and node info REST endpoints
 2017-05-11 00:35:46 +02:00
Daniel Nephin
6c28e8edd5 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>
 2017-05-10 17:59:30 -04:00
Daniel Nephin
ab3a037a5b Refactor interaction between dispatcher.from and dispatchState 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-10 17:58:57 -04:00
Daniel Nephin
b3bc7b28d0 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>
 2017-05-10 17:58:57 -04:00
Tõnis Tiigi
a3eebaf509 Merge pull request #33090 from tonistiigi/fix-release-mounts 
builder: Fix releasing implicit mounts
 2017-05-10 14:46:58 -07:00
Sebastiaan van Stijn
28d428f4ec Merge pull request #32061 from nishanttotla/engine-api-manifest 
Adding Docker API endpoint to inspect image manifest
 2017-05-10 23:43:30 +02:00
Brian Goff
e8c2a33b74 Merge pull request #33139 from stevvooe/remove-unused-functions 
pkg/ioutils: remove unused functions
 2017-05-10 16:48:14 -04:00
Brian Goff
a46f7bd5bd Merge pull request #33128 from crosbymichael/update-containerd-2x 
Update containerd for terminal updates
 2017-05-10 16:45:11 -04:00
Brian Goff
08fdce7738 Merge pull request #32571 from ehazlett/secret-targets 
Support Custom Secret Targets
 2017-05-10 16:26:35 -04:00
Ying Li
64cccedbce 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>
 2017-05-10 11:29:17 -07:00
Nishant Totla
4a812040eb
Adding example to /distribution/{name}/json endpoint swagger spec 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-05-10 11:20:03 -07:00
Aaron Lehmann
0da7bd0314 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>
 2017-05-10 10:23:10 -07:00
Aaron Lehmann
47a17c211d Use forked version of CLI for tests 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-10 10:23:10 -07:00
Aaron Lehmann
37ce91ddd6 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>
 2017-05-10 10:23:09 -07:00
Evan Hazlett
67d282a5c9 support custom paths for secrets 
This adds support to specify custom container paths for secrets.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-05-10 10:23:07 -07:00
Victor Vieux
f4349a77fd Merge pull request #33141 from vieux/update_builder 
fix builder report url
 2017-05-10 10:15:25 -07:00
Victor Vieux
890f021902 fix report url 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-05-10 10:14:18 -07:00
Victor Vieux
4836b0ab85 Merge pull request #33129 from vieux/builder-report-2017-05-07 
Add dev report for may 8th
 2017-05-10 09:25:24 -07:00
Victor Vieux
1397a49811 Add dev report for may 8th 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-05-10 09:11:07 -07:00
Brian Goff
6efdac4291 Merge pull request #33057 from dmcgowan/windows-download-descriptor 
Use diff ids from image configuration
 2017-05-10 11:36:19 -04:00
Stephen J Day
c546894aef
pkg/ioutils: remove unused functions 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-05-10 08:34:16 -07:00
Vincent Demeester
6e0e283387 Merge pull request #33087 from Microsoft/jjh/blockreadonly 
Windows: Block read-only
 2017-05-10 17:21:33 +02:00
Sebastiaan van Stijn
46f5d7e325 Merge pull request #33137 from albers/docs-report-link 
Fix link in dev report
 2017-05-10 16:13:30 +02:00
Sebastiaan van Stijn
2a7a938da4 Merge pull request #33045 from albers/completion--health-start-period 
Add bash completion for `--health-start-period`
 2017-05-10 15:54:43 +02:00
Harald Albers
94d3758487 Fix link in dev report 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-05-10 15:36:43 +02:00
Brian Goff
815e8bb885 Merge pull request #31012 from cpuguy83/do_not_remove_containers_on_error 
Do not remove containers from memory on error
 2017-05-10 06:21:28 -04:00
Vincent Demeester
22a03192fb Merge pull request #33114 from dnephin/fix-builder-warn-on-unused-builtint 
Fix warning for unused build args
 2017-05-10 09:38:07 +02:00
Madhu Venugopal
80bb6a46a3 Merge pull request #33094 from darrenstahlmsft/RevendorGoWinio 
Update go-winio to v0.4.0 (go 1.8.x works on Windows)
 2017-05-09 22:46:31 -07:00
Tibor Vass
c68612de0c Merge pull request #33123 from johnstep/windows-respect-client-repo 
Update make.ps1 to respect client repo
 2017-05-09 19:03:50 -07:00
Darren Stahl
24d4177859 Update go-winio to v0.4.0 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-05-09 17:49:55 -07:00
Nishant Totla
12e232ee35
/distribution/{name}/json returns full Descriptor object 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-05-09 17:25:27 -07:00
Michael Crosby
270a33b666 Add OPOST back to !cgo build for pkg/term 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-09 16:36:17 -07:00
Brian Goff
d1a7ea147c Merge pull request #33089 from Microsoft/jjh/hccsshimv0.5.16 
Revendor Microsoft\hcsshim @ v0.5.17
 2017-05-09 19:21:20 -04:00
Michael Crosby
6a96049ddf Update containerd for terminal updates 
Fixes #33101

This syncs up the OPOST changes for mkraw on the tty

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-09 16:14:31 -07:00
Daniel Nephin
543dfde637 Merge pull request #32997 from dnephin/fix-builder-scratch-with-name 
Fix a rare case where using FROM scratch as NAME would fail
 2017-05-09 18:15:33 -04:00