199effc58c
Bump Go to 1.10.4
...
Includes fixes to the go command, linker, and the net/http, mime/multipart,
ld/macho, bytes, and strings packages. See the Go 1.10.4 milestone on the
issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.10.4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 44ca0901d1github@gone.nl >
Upstream-commit: 76c09259db
2018-08-29 15:19:34 +02:00
9823e5c1f0
Merge pull request #1313 from dhiltgen/product_license
...
[18.09] Expose product license in info output
Upstream-commit: 8789e93d6e
2018-08-28 21:05:09 -07:00
eaabc7f477
Merge pull request #1312 from dhiltgen/dual_keys
...
[18.09] Add support for multiple signing keys
Upstream-commit: 0ee05a6353
2018-08-28 20:51:22 -07:00
68a6e99be4
Expose product license in info output
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 68be7cb376
2018-08-28 20:10:09 -07:00
b266ca7c3b
Merge pull request #1317 from dhiltgen/play_nice_with_proxy
...
Update proxy config if present
Upstream-commit: de805da04c
2018-08-28 15:01:56 -07:00
80cd126e9a
Merge pull request #1311 from dhiltgen/fix_progress
...
[18.09] Fix progress reporting for containerd pulls
Upstream-commit: b75350de7a
2018-08-28 14:59:59 -07:00
be6ee8f3d3
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 >
Upstream-commit: f96ddaedf7
2018-08-28 10:11:44 -07:00
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
2018-08-27 15:20:30 -07:00
ab04682b19
Vendor bump for licensing library to support multiple signing keys
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 264ee43c2a
2018-08-27 15:20:19 -07:00
64587cac6e
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 >
Upstream-commit: 7f4c842e8a
2018-08-27 14:44:13 -07:00
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
2018-08-27 13:46:15 +02:00
b7cdcaa0cf
update docs with the new features option in daemon.json
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
(cherry picked from commit 3e0b0a6692github@gone.nl >
Upstream-commit: 6877dedeee
2018-08-27 11:51:39 +02:00
a610952c4f
Merge pull request #1303 from thaJeztah/remove_buildkit_experimental_annotations
...
Remove "experimental" annotations for buildkit
Upstream-commit: 08cf36daa6
2018-08-22 00:57:27 +01:00
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
2018-08-22 00:51:19 +02:00
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
2018-08-22 00:38:59 +02:00
fc316c8fb4
Merge pull request #1225 from thaJeztah/told_you_so_I_wont_warn_you_again
...
Use warnings provided by daemon
Upstream-commit: ca782599fb
2018-08-21 13:42:16 -07:00
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
2018-08-21 22:29:57 +02:00
5c668597be
bump docker/docker
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7da71329bc
2018-08-21 22:29:43 +02:00
e421ac528c
Merge pull request #1233 from selansen/default_addr_pool
...
Global Default Address Pool feature support
Upstream-commit: e97d004395
2018-08-21 14:55:24 -04:00
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
2018-08-21 14:34:00 -04:00
a459cbb061
Merge pull request #1275 from AntaresS/buildkit-support
...
[enhancement] enable buildkit from daemon side
Upstream-commit: 2461cd618d
2018-08-20 16:15:32 -07:00
17cb083800
vendor dependency
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: acf43b62b5
2018-08-20 15:32:25 -07:00
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
2018-08-20 11:59:39 -07:00
6eb2284e77
Merge pull request #1302 from andrewhsu/venbk
...
vndr buildkit, containerd, console
Upstream-commit: 466e1b0741
2018-08-20 11:10:46 -07:00
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
2018-08-20 17:59:40 +00:00
66cdb5a200
Merge pull request #1260 from dhiltgen/ce_q3
...
Add CLI support for running dockerd in a container on containerd
Upstream-commit: 0c444c521f
2018-08-20 13:39:49 -04:00
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
2018-08-20 09:42:05 -07:00
18e4f23013
Vendoring bump for containerd and licensing
...
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com >
Upstream-commit: 11a312118f
2018-08-20 09:42:05 -07:00
38b4ba8a68
Merge pull request #1300 from mmacy/1299-trust-inspect-typo
...
Fix 'trust inspect' typo: "AdminstrativeKeys"
Upstream-commit: 3f7c6c8200
2018-08-20 10:08:45 +02:00
b81518c06e
[WIP] fix trust inspect typo 'AdminstrativeKeys'
...
Signed-off-by: mmacy <marsma@microsoft.com >
Upstream-commit: c11acddfb5
2018-08-19 17:57:04 -07:00
a5d51f25eb
Merge pull request #1297 from tiborvass/tls-update
...
vendor: update tlsconfig in go-connections to 7395e3f8aa162843a74ed6d48e79627d9792ac55
Upstream-commit: 5706f9518a
2018-08-19 14:46:46 -07:00
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
2018-08-17 18:31:25 -07:00
e3c0a7e0f8
Merge pull request #1295 from tiborvass/cmd-builder-prune-no-options
...
builder: Implement `builder prune` to prune build cache
Upstream-commit: b3d8c5deda
2018-08-17 18:28:37 -07:00
5a2db4495f
vendor: update tlsconfig in go-connections to 7395e3f8aa162843a74ed6d48e79627d9792ac55
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8ae74b38d5
2018-08-17 17:53:22 +00:00
6144be607e
build: Remove API requirement for --progress as it is CLI only
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 50f918801f
2018-08-17 16:24:02 +00:00
8c8e199673
Merge pull request #1288 from tiborvass/build-secrets
...
Build --secret with buildkit
Upstream-commit: cb142fa49f
2018-08-17 17:20:32 +01:00
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
2018-08-17 15:52:11 +00:00
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
2018-08-17 15:18:18 +00:00
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
2018-08-17 14:01:32 +00:00
aecdb056f0
Merge pull request #1276 from tiborvass/buildkit-progress-flag
...
build: change --console=[auto,false,true] to --progress=[auto,plain,tty]
Upstream-commit: 964173997d
2018-08-15 20:42:47 -07:00
a46d6924fa
Merge pull request #1014 from AkihiroSuda/connhelper-sshonly
...
support SSH connection
Upstream-commit: e92614a175
2018-08-14 15:12:06 -07:00
d8d0aaab1d
Merge pull request #1284 from adshmh/refactor-stack-ps-tests
...
refactor stack ps tests
Upstream-commit: 4d4392ba04
2018-08-14 18:59:56 +02:00
0b69793ee3
refactor stack ps tests to table-driven
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 340e4ee8e5
2018-08-10 15:13:45 -04:00
70a91dd01b
Merge pull request #1283 from adshmh/refactor-trust-revoke-tests
...
refactor trust revoke command unit tests
Upstream-commit: 3a3e720f91
2018-08-10 11:03:58 +02:00
e3e25812ec
Merge pull request #1280 from adshmh/refactor-trust-inspect-tests
...
refactor trust inspect command unit tests
Upstream-commit: 560b0cd863
2018-08-10 10:37:53 +02:00
ea09ac3378
refactored trust revoke command unit tests to use table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 984d76b9dd
2018-08-09 15:58:54 -04:00
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
2018-08-09 12:05:55 +02:00
64bf68b122
refactor trust inspect command unit tests to table-driven style
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: f8f0d72cf9
2018-08-08 13:50:00 -04:00
7435e1c862
use sortorder lib for sorting the output of volume list command
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 5cc1f9006a
2018-08-08 12:20:21 -04:00
73b3c56c30
use sortorder lib for sorting in trust package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 04bb3c770f
2018-08-08 12:20:10 -04:00
