Daniel Hiltgen
abe3a13a71
Add support for multiple signing keys
...
Basic enterprise licenses and platform license keys will be signed with
two different keys in the upcoming release. This adds support for the
CLI to support both variants.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 0fb6bb35a4
Component: cli
2018-08-27 15:20:30 -07:00
Daniel Hiltgen
ab04682b19
Vendor bump for licensing library to support multiple signing keys
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 264ee43c2a
Component: cli
2018-08-27 15:20:19 -07:00
Sebastiaan van Stijn
72ee90b9b2
Merge pull request #1310 from thaJeztah/18.09-backport_update-docs
...
[18.09] backport: update docs with the new features option in daemon.json
Upstream-commit: e25e9d68be
Component: cli
2018-08-27 13:46:15 +02:00
Anda Xu
b7cdcaa0cf
update docs with the new features option in daemon.json
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
(cherry picked from commit 3e0b0a6692 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6877dedeee
Component: cli
2018-08-27 11:51:39 +02:00
Sebastiaan van Stijn
a610952c4f
Merge pull request #1303 from thaJeztah/remove_buildkit_experimental_annotations
...
Remove "experimental" annotations for buildkit
Upstream-commit: 08cf36daa6
Component: cli
2018-08-22 00:57:27 +01:00
Sebastiaan van Stijn
ab4d7a2303
Move "session" support out of experimental for API 1.39 and up
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a500c394df
Component: cli
2018-08-22 00:51:19 +02:00
Sebastiaan van Stijn
ab525d6a99
Remove "experimental" annotations for buildkit
...
BuildKit can now be enabled without the daemon having
experimental features enabled.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 60c75fda67
Component: cli
2018-08-22 00:38:59 +02:00
Tibor Vass
fc316c8fb4
Merge pull request #1225 from thaJeztah/told_you_so_I_wont_warn_you_again
...
Use warnings provided by daemon
Upstream-commit: ca782599fb
Component: cli
2018-08-21 13:42:16 -07:00
Sebastiaan van Stijn
d6a674adf4
Use warnings provided by daemon
...
Warnings are now generated by the daemon, and returned as
part of the /info API response.
If warnings are returned by the daemon; use those instead
of generating them locally.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3c27ce21c9
Component: cli
2018-08-21 22:29:57 +02:00
Sebastiaan van Stijn
5c668597be
bump docker/docker
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7da71329bc
Component: cli
2018-08-21 22:29:43 +02:00
Michael Crosby
e421ac528c
Merge pull request #1233 from selansen/default_addr_pool
...
Global Default Address Pool feature support
Upstream-commit: e97d004395
Component: cli
2018-08-21 14:55:24 -04:00
selansen
534b83a7cb
Global Default Address Pool feature support
...
This feature brings new attribute/option for swarm init command.
default-addr-pool will take string input which can be in below format.
"CIDR,CIDR,CIDR...:SUBNET-SIZE".
Signed-off-by: selansen <elango.siva@docker.com >
Upstream-commit: 587a94c935
Component: cli
2018-08-21 14:34:00 -04:00
Andrew Hsu
a459cbb061
Merge pull request #1275 from AntaresS/buildkit-support
...
[enhancement] enable buildkit from daemon side
Upstream-commit: 2461cd618d
Component: cli
2018-08-20 16:15:32 -07:00
Anda Xu
17cb083800
vendor dependency
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: acf43b62b5
Component: cli
2018-08-20 15:32:25 -07:00
Anda Xu
01ffacab2e
enable buildkit as builder from daemon; no env var needs to be set
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: ef09ca8987
Component: cli
2018-08-20 11:59:39 -07:00
Andrew Hsu
6eb2284e77
Merge pull request #1302 from andrewhsu/venbk
...
vndr buildkit, containerd, console
Upstream-commit: 466e1b0741
Component: cli
2018-08-20 11:10:46 -07:00
Andrew Hsu
aab5441f89
vndr buildkit, containerd, and console
...
vndr buildkit to e8c7acc
vndr containerd to v1.2.0-beta.0
vndr console to 4d8a41f
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 7a73d112ff
Component: cli
2018-08-20 17:59:40 +00:00
Michael Crosby
66cdb5a200
Merge pull request #1260 from dhiltgen/ce_q3
...
Add CLI support for running dockerd in a container on containerd
Upstream-commit: 0c444c521f
Component: cli
2018-08-20 13:39:49 -04:00
Daniel Hiltgen
f4a7b44342
Add engine commands built on containerd
...
This new collection of commands supports initializing a local
engine using containerd, updating that engine, and activating
the EE product
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: fd2f1b3b66
Component: cli
2018-08-20 09:42:05 -07:00
Daniel Hiltgen
18e4f23013
Vendoring bump for containerd and licensing
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 11a312118f
Component: cli
2018-08-20 09:42:05 -07:00
Vincent Demeester
38b4ba8a68
Merge pull request #1300 from mmacy/1299-trust-inspect-typo
...
Fix 'trust inspect' typo: "AdminstrativeKeys"
Upstream-commit: 3f7c6c8200
Component: cli
2018-08-20 10:08:45 +02:00
mmacy
b81518c06e
[WIP] fix trust inspect typo 'AdminstrativeKeys'
...
Signed-off-by: mmacy <marsma@microsoft.com >
Upstream-commit: c11acddfb5
Component: cli
2018-08-19 17:57:04 -07:00
Andrew Hsu
a5d51f25eb
Merge pull request #1297 from tiborvass/tls-update
...
vendor: update tlsconfig in go-connections to 7395e3f8aa162843a74ed6d48e79627d9792ac55
Upstream-commit: 5706f9518a
Component: cli
2018-08-19 14:46:46 -07:00
Andrew Hsu
1b348ba107
Merge pull request #1296 from tiborvass/build-progress-flag-no-api-requirement
...
build: Remove API requirement for --progress as it is CLI only
Upstream-commit: f472a1a480
Component: cli
2018-08-17 18:31:25 -07:00
Andrew Hsu
e3c0a7e0f8
Merge pull request #1295 from tiborvass/cmd-builder-prune-no-options
...
builder: Implement `builder prune` to prune build cache
Upstream-commit: b3d8c5deda
Component: cli
2018-08-17 18:28:37 -07:00
Tibor Vass
5a2db4495f
vendor: update tlsconfig in go-connections to 7395e3f8aa162843a74ed6d48e79627d9792ac55
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8ae74b38d5
Component: cli
2018-08-17 17:53:22 +00:00
Tibor Vass
6144be607e
build: Remove API requirement for --progress as it is CLI only
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 50f918801f
Component: cli
2018-08-17 16:24:02 +00:00
Sebastiaan van Stijn
8c8e199673
Merge pull request #1288 from tiborvass/build-secrets
...
Build --secret with buildkit
Upstream-commit: cb142fa49f
Component: cli
2018-08-17 17:20:32 +01:00
Tibor Vass
fefaefabba
vendor: Bump default API version to 1.39
...
vendors github.com/docker/docker to a7ff19d69a90dfe152abd146221c8b9b46a0903d
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: b4057f0293
Component: cli
2018-08-17 15:52:11 +00:00
Tibor Vass
e4ceae5ee2
Add new builder subcommand and implement builder prune to prune build cache.
...
This patch adds a new builder subcommand, allowing to add more builder-related
commands in the future. Unfortunately `build` expects an argument so could not
be used as a subcommand.
This also implements `docker builder prune`, which is needed to prune the builder
cache manually without having to call `docker system prune`.
Today when relying on the legacy builder, users are able to prune dangling images
(used as build cache) by running `docker image prune`. This patch allows the
same usecase with buildkit.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: f597f2d026
Component: cli
2018-08-17 15:18:18 +00:00
Tibor Vass
a75ae7bafa
build: implement build secrets with buildkit
...
This patch implements `docker build --secret id=mysecret,src=/secret/file`
for buildkit frontends that request the mysecret secret.
It is currently implemented in the tonistiigi/dockerfile:secrets20180808
frontend via RUN --mount=type=secret,id=mysecret
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: c4c4825591
Component: cli
2018-08-17 14:01:32 +00:00
Tibor Vass
aecdb056f0
Merge pull request #1276 from tiborvass/buildkit-progress-flag
...
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
Upstream-commit: 964173997d
Component: cli
2018-08-15 20:42:47 -07:00
Brian Goff
a46d6924fa
Merge pull request #1014 from AkihiroSuda/connhelper-sshonly
...
support SSH connection
Upstream-commit: e92614a175
Component: cli
2018-08-14 15:12:06 -07:00
Sebastiaan van Stijn
d8d0aaab1d
Merge pull request #1284 from adshmh/refactor-stack-ps-tests
...
refactor stack ps tests
Upstream-commit: 4d4392ba04
Component: cli
2018-08-14 18:59:56 +02:00
Arash Deshmeh
0b69793ee3
refactor stack ps tests to table-driven
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 340e4ee8e5
Component: cli
2018-08-10 15:13:45 -04:00
Silvin
70a91dd01b
Merge pull request #1283 from adshmh/refactor-trust-revoke-tests
...
refactor trust revoke command unit tests
Upstream-commit: 3a3e720f91
Component: cli
2018-08-10 11:03:58 +02:00
Vincent Demeester
e3e25812ec
Merge pull request #1280 from adshmh/refactor-trust-inspect-tests
...
refactor trust inspect command unit tests
Upstream-commit: 560b0cd863
Component: cli
2018-08-10 10:37:53 +02:00
Arash Deshmeh
ea09ac3378
refactored trust revoke command unit tests to use table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 984d76b9dd
Component: cli
2018-08-09 15:58:54 -04:00
Sebastiaan van Stijn
e2e1350a4c
Merge pull request #1266 from adshmh/use-natural-sort-order-for-network-list
...
use sortorder library for sorting network list output
Upstream-commit: 6ef11c516d
Component: cli
2018-08-09 12:05:55 +02:00
Arash Deshmeh
64bf68b122
refactor trust inspect command unit tests to table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: f8f0d72cf9
Component: cli
2018-08-08 13:50:00 -04:00
Arash Deshmeh
7435e1c862
use sortorder lib for sorting the output of volume list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 5cc1f9006a
Component: cli
2018-08-08 12:20:21 -04:00
Arash Deshmeh
73b3c56c30
use sortorder lib for sorting in trust package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 04bb3c770f
Component: cli
2018-08-08 12:20:10 -04:00
Arash Deshmeh
21c2c41660
use sortorder lib for sorting network list output
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: a921313caf
Component: cli
2018-08-08 12:06:59 -04:00
Tibor Vass
9e965fad85
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
...
This changes the experimental --console flag to --progress following
feedback indicating avoidable confusion.
In addition to naming changes, the help output now has an additional
clarification, specifically: container output during builds are only
shown when progress output is set to plain. Not mentioning this was also
a big cause of confusion.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: faeb8bb571
Component: cli
2018-08-07 18:18:13 +00:00
Sebastiaan van Stijn
d098202034
Merge pull request #1277 from vdemeester/template-subtests-followup
...
Migrate `TestExtractVariables` to subtests…
Upstream-commit: 1d04f7d66b
Component: cli
2018-08-07 16:30:11 +02:00
Vincent Demeester
68e01b8ab7
Migrate TestExtractVariables to subtests…
...
… as suggested in previous PR comment.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9cd7c1361c
Component: cli
2018-08-07 16:06:13 +02:00
Sebastiaan van Stijn
c213d85ec3
Merge pull request #1271 from albers/completion-shellcheck
...
Fix shellcheck warnings
Upstream-commit: b5768bea9b
Component: cli
2018-08-04 01:36:36 +02:00
Sebastiaan van Stijn
6d14e4f6a2
Merge pull request #1269 from albers/completion-cp--archive
...
Add bash completion for `cp --archive`
Upstream-commit: e8cd06c8eb
Component: cli
2018-08-03 23:48:52 +02:00
Harald Albers
22b9c5ed2c
Merge pull request #1270 from Ace-Tang/master
...
bash completion: fix uncorrect completion
Upstream-commit: ad28cec012
Component: cli
2018-08-03 23:26:09 +02:00
Harald Albers
73443cfafe
Fix shellcheck warnings
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e587ec293b
Component: cli
2018-08-03 15:28:09 +02:00