Daniel Hiltgen
f96ddaedf7
Update proxy config if present
...
If the system has a containerd-proxy managing the lifecycle
of the daemon, make sure the config is updated with the new image
on update.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-08-28 10:11:44 -07:00
Daniel Hiltgen
0fb6bb35a4
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>
2018-08-27 15:20:30 -07:00
Daniel Hiltgen
264ee43c2a
Vendor bump for licensing library to support multiple signing keys
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-08-27 15:20:19 -07:00
Daniel Hiltgen
7f4c842e8a
Fix progress reporting for containerd pulls
...
During refactoring of the implementation PR progress reporting
was broken. This gets the progress reporting back in action.
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-08-27 14:44:13 -07:00
Sebastiaan van Stijn
e25e9d68be
Merge pull request #1310 from thaJeztah/18.09-backport_update-docs
...
[18.09] backport: update docs with the new features option in daemon.json
2018-08-27 13:46:15 +02:00
Anda Xu
6877dedeee
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>
2018-08-27 11:51:39 +02:00
Sebastiaan van Stijn
08cf36daa6
Merge pull request #1303 from thaJeztah/remove_buildkit_experimental_annotations
...
Remove "experimental" annotations for buildkit
2018-08-22 00:57:27 +01:00
Sebastiaan van Stijn
a500c394df
Move "session" support out of experimental for API 1.39 and up
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-08-22 00:51:19 +02:00
Sebastiaan van Stijn
60c75fda67
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>
2018-08-22 00:38:59 +02:00
Tibor Vass
ca782599fb
Merge pull request #1225 from thaJeztah/told_you_so_I_wont_warn_you_again
...
Use warnings provided by daemon
2018-08-21 13:42:16 -07:00
Sebastiaan van Stijn
3c27ce21c9
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>
2018-08-21 22:29:57 +02:00
Sebastiaan van Stijn
7da71329bc
bump docker/docker
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-08-21 22:29:43 +02:00
Michael Crosby
e97d004395
Merge pull request #1233 from selansen/default_addr_pool
...
Global Default Address Pool feature support
2018-08-21 14:55:24 -04:00
selansen
587a94c935
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>
2018-08-21 14:34:00 -04:00
Andrew Hsu
2461cd618d
Merge pull request #1275 from AntaresS/buildkit-support
...
[enhancement] enable buildkit from daemon side
2018-08-20 16:15:32 -07:00
Anda Xu
acf43b62b5
vendor dependency
...
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-08-20 15:32:25 -07:00
Anda Xu
ef09ca8987
enable buildkit as builder from daemon; no env var needs to be set
...
Signed-off-by: Anda Xu <anda.xu@docker.com>
2018-08-20 11:59:39 -07:00
Andrew Hsu
466e1b0741
Merge pull request #1302 from andrewhsu/venbk
...
vndr buildkit, containerd, console
2018-08-20 11:10:46 -07:00
Andrew Hsu
7a73d112ff
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>
2018-08-20 17:59:40 +00:00
Michael Crosby
0c444c521f
Merge pull request #1260 from dhiltgen/ce_q3
...
Add CLI support for running dockerd in a container on containerd
2018-08-20 13:39:49 -04:00
Daniel Hiltgen
fd2f1b3b66
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>
2018-08-20 09:42:05 -07:00
Daniel Hiltgen
11a312118f
Vendoring bump for containerd and licensing
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-08-20 09:42:05 -07:00
Vincent Demeester
3f7c6c8200
Merge pull request #1300 from mmacy/1299-trust-inspect-typo
...
Fix 'trust inspect' typo: "AdminstrativeKeys"
2018-08-20 10:08:45 +02:00
mmacy
c11acddfb5
[WIP] fix trust inspect typo 'AdminstrativeKeys'
...
Signed-off-by: mmacy <marsma@microsoft.com>
2018-08-19 17:57:04 -07:00
Andrew Hsu
5706f9518a
Merge pull request #1297 from tiborvass/tls-update
...
vendor: update tlsconfig in go-connections to 7395e3f8aa162843a74ed6d48e79627d9792ac55
2018-08-19 14:46:46 -07:00
Andrew Hsu
f472a1a480
Merge pull request #1296 from tiborvass/build-progress-flag-no-api-requirement
...
build: Remove API requirement for --progress as it is CLI only
2018-08-17 18:31:25 -07:00
Andrew Hsu
b3d8c5deda
Merge pull request #1295 from tiborvass/cmd-builder-prune-no-options
...
builder: Implement `builder prune` to prune build cache
2018-08-17 18:28:37 -07:00
Tibor Vass
8ae74b38d5
vendor: update tlsconfig in go-connections to 7395e3f8aa162843a74ed6d48e79627d9792ac55
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-08-17 17:53:22 +00:00
Tibor Vass
50f918801f
build: Remove API requirement for --progress as it is CLI only
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-08-17 16:24:02 +00:00
Sebastiaan van Stijn
cb142fa49f
Merge pull request #1288 from tiborvass/build-secrets
...
Build --secret with buildkit
2018-08-17 17:20:32 +01:00
Tibor Vass
b4057f0293
vendor: Bump default API version to 1.39
...
vendors github.com/docker/docker to a7ff19d69a90dfe152abd146221c8b9b46a0903d
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-08-17 15:52:11 +00:00
Tibor Vass
f597f2d026
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>
2018-08-17 15:18:18 +00:00
Tibor Vass
c4c4825591
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>
2018-08-17 14:01:32 +00:00
Tibor Vass
964173997d
Merge pull request #1276 from tiborvass/buildkit-progress-flag
...
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
2018-08-15 20:42:47 -07:00
Brian Goff
e92614a175
Merge pull request #1014 from AkihiroSuda/connhelper-sshonly
...
support SSH connection
2018-08-14 15:12:06 -07:00
Sebastiaan van Stijn
4d4392ba04
Merge pull request #1284 from adshmh/refactor-stack-ps-tests
...
refactor stack ps tests
2018-08-14 18:59:56 +02:00
Arash Deshmeh
340e4ee8e5
refactor stack ps tests to table-driven
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-08-10 15:13:45 -04:00
Silvin
3a3e720f91
Merge pull request #1283 from adshmh/refactor-trust-revoke-tests
...
refactor trust revoke command unit tests
2018-08-10 11:03:58 +02:00
Vincent Demeester
560b0cd863
Merge pull request #1280 from adshmh/refactor-trust-inspect-tests
...
refactor trust inspect command unit tests
2018-08-10 10:37:53 +02:00
Arash Deshmeh
984d76b9dd
refactored trust revoke command unit tests to use table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-08-09 15:58:54 -04:00
Sebastiaan van Stijn
6ef11c516d
Merge pull request #1266 from adshmh/use-natural-sort-order-for-network-list
...
use sortorder library for sorting network list output
2018-08-09 12:05:55 +02:00
Arash Deshmeh
f8f0d72cf9
refactor trust inspect command unit tests to table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-08-08 13:50:00 -04:00
Arash Deshmeh
5cc1f9006a
use sortorder lib for sorting the output of volume list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-08-08 12:20:21 -04:00
Arash Deshmeh
04bb3c770f
use sortorder lib for sorting in trust package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-08-08 12:20:10 -04:00
Arash Deshmeh
a921313caf
use sortorder lib for sorting network list output
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-08-08 12:06:59 -04:00
Tibor Vass
faeb8bb571
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>
2018-08-07 18:18:13 +00:00
Sebastiaan van Stijn
1d04f7d66b
Merge pull request #1277 from vdemeester/template-subtests-followup
...
Migrate `TestExtractVariables` to subtests…
2018-08-07 16:30:11 +02:00
Vincent Demeester
9cd7c1361c
Migrate `TestExtractVariables` to subtests…
...
… as suggested in previous PR comment.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-08-07 16:06:13 +02:00
Sebastiaan van Stijn
b5768bea9b
Merge pull request #1271 from albers/completion-shellcheck
...
Fix shellcheck warnings
2018-08-04 01:36:36 +02:00
Sebastiaan van Stijn
e8cd06c8eb
Merge pull request #1269 from albers/completion-cp--archive
...
Add bash completion for `cp --archive`
2018-08-03 23:48:52 +02:00