starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-10-17 11:21:37 -04:00
Code Issues Packages Projects Releases Wiki Activity
36,672 Commits 14 Branches 328 Tags
v17.06.0-ce
Commit Graph
36672 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
cyli 7844cb9f87 Propagate the swarm cluster and node TLS info provided by the REST API 
responses to the CLI. In `node ls`, 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: b75858eb09
Component: cli
 2017-05-10 17:49:25 -07:00
Tibor Vass abc8d1ca5c Merge pull request #59 from crosbymichael/update-term 
Update docker dependency for pkg/term
Upstream-commit: 3574e6a674
Component: cli
 2017-05-10 17:19:01 -07:00
Brian Goff 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
Brian Goff 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
Brian Goff 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
Michael Crosby bf9b362347 Update docker dependency 
We need the `pkg/term` dep from docker with OPOST added to the MakeRaw
call in order for the new runc 1.0 integration to work properly.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 56ea98f5ad
Component: cli
 2017-05-10 16:07:07 -07:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 8e24a71ed1 Move "labels" to compose 3.3 format 
Commit bb5dfdb8c5acd48f17498b111db360820a50baec added a
labels option to the docker-compose file format, but
added it to the 3.2 schema.

This patch moves the change to the 3.3 schema

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: 131fe7dfb2
Component: cli
 2017-05-11 08:30:48 +10:00
Daniel Nephin 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
Daniel Nephin 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
Daniel Nephin 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
Tõnis Tiigi 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
Sebastiaan van Stijn 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
Derek McGowan 6481987490 Expose trust key path in config 
Allows storing key under any directory. In the case where the
"/etc/docker" directory is not preserved, this file can be
specified to a location where it will be preserved to ensure
the ID does not change across restarts.

Note this key is currently only used today to generate the ID
used in Docker info and for manifest schema v1 pushes. The key
signature and finger on these manifests are not checked or
used any longer for security, deprecated by notary.

Removes old key migration from a pre-release of Docker which put
the key under the home directory and was used to preserve ID used
for swarm v1 after the file moved.

closes #32135

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: e428c824c35e85a02fffee592b79ab7db1a0c4d2
Component: engine
 2017-05-10 14:16:27 -07:00
Brian Goff 1ae912ce6f Merge pull request #50 from aaronlehmann/secret-targets 
Support Custom Secret Targets
Upstream-commit: 0f6f1eafe3
Component: cli
 2017-05-10 17:04:20 -04:00
Aaron Lehmann 7b4cbe9700 Support Custom Secret Targets 
CLI counterpart to https://github.com/moby/moby/pull/32571. Just
involves vendoring github.com/docker/docker/opts.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 978aa7ede0
Component: cli
 2017-05-10 13:59:33 -07:00
Brian Goff 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
Daniel Nephin 3c464d65a2 Merge pull request #66 from stevvooe/remove-ioutils-dependency-onfprint 
cli/command/system: remove ioutils dependency
Upstream-commit: d4a2d5a520
Component: cli
 2017-05-10 16:45:55 -04:00
Brian Goff 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
Stephen J Day c85c900b60 cli/command/system: remove ioutils dependency 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 9a892f1bbc
Component: cli
 2017-05-10 13:38:06 -07:00
Brian Goff 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
John Howard 32855f15ee Fix flaky TestAPIStatsNoStreamGetCpu 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c141574d5d9ea7bb5188764d5d193450dc2b9bc8
Component: engine
 2017-05-10 13:26:04 -07:00
Daniel Nephin 91afc881f6 Merge pull request #56 from dnephin/add-compose-bindata-check 
Add CI validation for compose bindata
Upstream-commit: bcc46e75ab
Component: cli
 2017-05-10 15:49:06 -04:00
Brian Goff 31b2ee9f8a Merge pull request #65 from nishanttotla/update-swarmkit-vendor 
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Upstream-commit: b00dd755fc
Component: cli
 2017-05-10 15:41:56 -04:00
John Stephens 2ec10e1c37 Build client on Windows in a temporary directory 
Signed-off-by: John Stephens <johnstep@docker.com>
Upstream-commit: 32d47be2633bab3c606213ac44a4666aa616c64a
Component: engine
 2017-05-10 11:45:10 -07:00
Nishant Totla e4ab7cd772 Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 85504b4f98
Component: cli
 2017-05-10 11:40:19 -07:00
Ying Li 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
Nishant Totla 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
Aaron Lehmann 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
Aaron Lehmann 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
Aaron Lehmann 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
Evan Hazlett 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Victor Vieux 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
Brian Goff 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
Stephen J Day 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
Vincent Demeester 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Harald Albers 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
Brian Goff 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
Vincent Demeester 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
Vincent Demeester 239a95a29d Merge pull request #55 from mlaventure/generate-proper-version 
Display proper version information
Upstream-commit: ed5762cb9f
Component: cli
 2017-05-10 09:34:22 +02:00
Madhu Venugopal 1abb72aa24 Merge pull request #60 from darrenstahlmsft/revendorGowinio 
Move back to upstream go-winio v0.4.0
Upstream-commit: ed7b5bb462
Component: cli
 2017-05-09 22:47:49 -07:00
Madhu Venugopal 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
Tibor Vass 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
Darren Stahl 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
Nishant Totla 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