docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity
5,621 Commits 12 Branches 295 Tags
dd2f13bed4347e075da494c8635aa148baa5cd9d
Commit Graph

5621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Howard
dd2f13bed4 LCOW: --platform on import (already in API) 
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit b55a0b681f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-09-14 14:26:39 +02:00
Silvin Lubecki
3b991ec615 Merge pull request #1373 from thaJeztah/18.09_backport_move_test_function_in_there 
[18.09] backport getEngineConfigFilePath is only used during test so moving it in test files for now.
 2018-09-14 13:20:12 +02:00
Sebastiaan van Stijn
34ea8bb5a5 Merge pull request #1374 from thaJeztah/18.09_backport_docs_fixes 
[18.09] backport update usage for 'docker build' with '--progress' and '--secret' options
 2018-09-14 12:55:50 +02:00
Anda Xu
afb17ec70b update usage for 'docker build' with '--progress' and '--secret' options 
Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 83ca55db7d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-09-14 12:35:22 +02:00
Vincent Demeester
62aed95bc1 getEngineConfigFilePath is only used during test… 
… so moving it in test files for now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 37ca5d6813)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-09-14 12:27:13 +02:00
Silvin Lubecki
649e4916bb Merge pull request #1368 from thaJeztah/carry-1360-store_prefix 
[18.09] Prefix engine repo with store
 2018-09-13 08:24:45 +02:00
Daniel Hiltgen
3597d75281 Prefix engine repo with store 
The official access point for the Q3 engine images will
be prefixed by store.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-09-12 13:43:04 +02:00
Vincent Demeester
5673816fec Merge pull request #1364 from thaJeztah/18.09-backport_contains-containerized 
[18.09] backport: remove containerizedengine package dependency from docker/cli/command…
 2018-09-12 08:55:12 +02:00
Silvin Lubecki
a8c69c8287 Merge pull request #1365 from thaJeztah/18.09-backport_engine-only-linux 
[18.09] backport add `docker engine` commands only on Linux…
 2018-09-11 18:04:57 +02:00
Vincent Demeester
fc3dc8f058 Remove containerizedengine package dependency from docker/cli/command… 
… this removes a whole lot of dependencies from people depending on docker/cli…

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 2d344b2f61)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-09-11 17:01:02 +02:00
Vincent Demeester
2a46a3d46c Add docker engine commands only on Linux… 
… this is, for now, the only platform that is supported

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit a3a955f204)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-09-11 16:57:54 +02:00
Andrew Hsu
44371c7c34 Merge pull request #1339 from andrewhsu/vr 
[18.09] vndr docker/docker to docker/engine d2ecc7b
v18.09.0-ce-beta1 v18.09.0-ce-tp6 		2018-09-05 11:43:09 -07:00
Andrew Hsu
4e6798794d vndr docker/docker to docker/engine d2ecc7b 
And update the associated packages that have also updated from
docker/docker vendor.conf.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-09-05 17:35:51 +00:00
Tibor Vass
d8aefad94a Merge pull request #1334 from tiborvass/18.09-cmd-builder-prune-with-options 
[18.09] build: add options to builder prune
 2018-09-04 22:35:23 -07:00
Tibor Vass
3c37d6a034 system df: show table output for build cache 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit ca608c2302)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-05 03:33:30 +00:00
Tibor Vass
9d43f1ed48 build: add options to builder prune 
This patch adds --filter, --keep-storage, --all and --force to builder prune.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit c806eb49c9)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-09-05 03:33:30 +00:00
Vincent Demeester
a818677813 Merge pull request #1322 from thaJeztah/18.09_backport_bump_kube_deps 
[18.09] backport: bump kube dependency to 1.11.2
v18.09.0-ce-tp5 		2018-08-29 17:56:26 +02:00
Vincent Demeester
c204959687 Merge pull request #1323 from thaJeztah/18.09_backport_bump_golang_1.10.4 
[18.09] backport: bump Go to 1.10.4
 2018-08-29 15:32:30 +02:00
Sebastiaan van Stijn
76c09259db 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 44ca0901d1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-29 15:19:34 +02:00
Marcus Martins
0efb62cab1 Bump kube dependency to 1.11.2 
Bump our kube dependencies to the latest patch
level for kube 1.11.

Signed-off-by: Marcus Martins <marcus@docker.com>
(cherry picked from commit c67e05796b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-29 14:59:20 +02:00
Andrew Hsu
8789e93d6e Merge pull request #1313 from dhiltgen/product_license 
[18.09] Expose product license in info output
 2018-08-28 21:05:09 -07:00
Andrew Hsu
0ee05a6353 Merge pull request #1312 from dhiltgen/dual_keys 
[18.09] Add support for multiple signing keys
 2018-08-28 20:51:22 -07:00
Daniel Hiltgen
68be7cb376 Expose product license in info output 
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
 2018-08-28 20:10:09 -07:00
Andrew Hsu
de805da04c Merge pull request #1317 from dhiltgen/play_nice_with_proxy 
Update proxy config if present
 2018-08-28 15:01:56 -07:00
Andrew Hsu
b75350de7a Merge pull request #1311 from dhiltgen/fix_progress 
[18.09] Fix progress reporting for containerd pulls
 2018-08-28 14:59:59 -07:00
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
v18.09.0-ce-tp4 v18.09.0-ce-tp3 v18.09.0-ce-tp0 		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