p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5,479 Commits 3 Branches 295 Tags
c1ea761867553cea4e70d09e30bbba44ca1fc2ed
Commit Graph

5479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
c1ea761867 Merge pull request #1550 from SimonHeimberg/patch-1 
list state `ready` for filtering in stack_ps.md
v18.06.2-ce v18.06.3-ce 		2018-12-19 12:01:57 +01:00
Simon Heimberg
6a20e87ae8 list state ready for filtering in stack_ps.md 
Signed-off-by: SimonHeimberg <simon.heimberg@heimberg-ea.ch>
 2018-12-18 18:52:09 +01:00
Brian Goff
0366a4b2ea Merge pull request #1433 from thaJeztah/18.06_backport_use_string_builder 
[18.06] backport using strings.Builder instead of string appending
 2018-10-16 19:29:21 -07:00
Li Yi
9a2ede8b01 Using strings.Builder instead of string appending 
Signed-off-by: Li Yi <denverdino@gmail.com>
(cherry picked from commit 814ced4b30)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-10-10 20:22:53 +02:00
Silvin Lubecki
a80c6e1f8c Merge pull request #1328 from thaJeztah/18.06_backport_bump_golang_1.10.4 
[18.06] backport: bump Go to 1.10.4
 2018-08-30 14:33:26 +02:00
Sebastiaan van Stijn
4fe2788e0e 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-30 13:54:26 +02:00
Sebastiaan van Stijn
67f9a3912c Merge pull request #1289 from andrewhsu/b 
[18.06] vndr of buildkit to 98f1604
v18.06.1-ce v18.06.1-ce-rc2 		2018-08-14 16:54:37 +02:00
Andrew Hsu
bb983ee75b vndr units to 6950e57 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-08-14 06:22:59 +00:00
Andrew Hsu
094ed67122 vndr containerd to b416337 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-08-14 06:17:30 +00:00
Andrew Hsu
946b13d2d9 vndr buildkit to 98f1604 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-08-14 05:37:50 +00:00
Silvin
2749843368 Merge pull request #1272 from thaJeztah/18.06-completion-updates 
[18.06] backport various Bash completion script updates
v18.06.1-ce-rc1 		2018-08-07 18:12:51 +02:00
Harald Albers
c31d0ea160 Fix shellcheck warnings 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e587ec293b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-04 01:42:58 +02:00
Harald Albers
3c6ad54e95 Add bash completion for cp --archive 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit b9b3754ad3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-04 01:42:51 +02:00
Silvin Lubecki
b3f1fb5418 Remove outdated completion reviewers file 
Clean maintainers and code owners files

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit 9022a00fbe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-04 01:42:42 +02:00
Harald Albers
37890ac58d Add bash completion for kubernetes orchestrator 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 08f8ee1320)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-04 01:42:35 +02:00
Harald Albers
df806ee61c Only complete swarm specific options with orchestrator=swarm 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 8ef01e869e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-04 01:42:29 +02:00
Harald Albers
ee7705035c Add support for orchestrator specific bash completions 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit ff953751d3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-04 01:42:22 +02:00
Harald Albers
46d424b49b Add bash completion for service logs --details|--raw 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 4912846de2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-04 01:42:13 +02:00
Sebastiaan van Stijn
c2fa77357a Merge pull request #1229 from thaJeztah/18.06-backport-completion 
[18.06] Added events filter scope for bash and zsh completion
 2018-08-03 23:15:26 +02:00
Silvin
3dbd9eaf78 Merge pull request #1267 from thaJeztah/18.06-backport-fix-stack-help-command 
[18.06] backport "Fix help message flags on docker stack commands and sub-commands"
 2018-08-03 23:07:31 +02:00
Silvin
35d05c2de6 Merge pull request #1268 from thaJeztah/18.06-backport-1231-zsh-autocomplete-update-invalid 
[18.06] backport "fixed typo breaking zsh docker update autocomplete"
 2018-08-03 22:56:37 +02:00
Silvin Lubecki
911e86cb9f Fix help message flags on docker stack commands and sub-commands 
PersistentPreRunE needs to be called within the help function to initialize all the flags (notably the orchestrator flag)
Add an e2e test as regression test

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit 21cce52b30)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-03 19:27:31 +02:00
Sebastiaan van Stijn
050f334818 Update --compose-file flag description to mention stdin 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2c7822b036)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-03 19:27:23 +02:00
Tom Milligan
2c9ca7465d Fixed typo breaking zsh docker update autocomplete 
Signed-off-by: Tom Milligan <tommilligan@users.noreply.github.com>
(cherry picked from commit da00d1c49f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-08-03 14:20:23 +02:00
Silvin
11720451eb Merge pull request #1241 from thaJeztah/18.06-backport-1110-Fix-Warning-Message 
[18.06] Fix: Warning Message
 2018-07-30 15:46:24 +02:00
Vimal Raghubir
65a42c8236 Fix: Warning Message 
Signed-off-by: Vimal-Raghubir <vraghubir0418@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ce3d069936)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-30 11:19:46 +02:00
Paweł Szczekutowicz
ddad2f519a Added events filter scope zsh completion 
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com>
(cherry picked from commit 13db1bc95f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-23 11:43:47 +02:00
Paweł Szczekutowicz
4e6dbe6a5c Added events filter scope bash completion 
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com>
(cherry picked from commit c922ea2f45)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-23 11:43:40 +02:00
Andrew Hsu
2cb2e84287 Merge pull request #1207 from thaJeztah/18.06-backport-improve-version-align 
[18.06] Improve version output alignment
v18.06.0-ce 		2018-07-18 08:22:13 -07:00
Andrew Hsu
97dd580c86 Merge pull request #1214 from thaJeztah/18.06-docs-fixes 
[18.06] documentation and man-page fixes
 2018-07-18 08:10:21 -07:00
Peter Kehl
deacc39445 For docker/docker.github.io/issues/6987 
Signed-off-by: Peter Kehl <peter.kehl@gmail.com>
(cherry picked from commit 249c8652a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-16 12:25:32 +02:00
Silvin Lubecki
e1ee48ab04 Fixing issue #1167 "Format example typo" 
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
(cherry picked from commit d0ddf91539)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-16 12:25:27 +02:00
Vimal Raghubir
254566169d Add: Add missing option 
Signed-off-by: Vimal-Raghubir <vraghubir0418@gmail.com>
(cherry picked from commit a205aecb80)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-16 12:25:22 +02:00
Harald Albers
9cb345caae Merge pull request #1211 from thaJeztah/18.06-backport-completion-service-create--init 
[18.06] Add bash completion for `service create|update --init`
 2018-07-13 14:10:55 +02:00
Harald Albers
a92b4dc752 Add bash completion for service create|update --init 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 97d312e02a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-13 11:05:14 +02:00
Sebastiaan van Stijn
6f5a828403 Adapt min-column width to component information 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0f7ae34ea9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-12 11:37:51 +02:00
Sebastiaan van Stijn
a33c562cf3 Extend version-align test with components 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 55ff66d967)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-12 11:37:45 +02:00
Andrew Hsu
7178075fda Merge pull request #1205 from thaJeztah/18.06-bump-dockerd 
[18.06] Bump engine to tip of 18.06 branch
v18.06.0-ce-rc3 		2018-07-11 18:19:53 -07:00
Sebastiaan van Stijn
744938f0b9 Bump engine to tip of 18.06 branch 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-12 02:53:31 +02:00
Sebastiaan van Stijn
1d5e206fc2 Merge pull request #1199 from thaJeztah/18.06-backport-fix-swarm-ca-command 
[18.06] Propagate the provided external CA certificate to the external CA object in swarm
 2018-07-10 10:47:13 +02:00
Ying Li
31d6292458 Propagate the provided external CA certificate to the external CA object 
in swarm.

Also, fix some CLI command confusions:
1. If the --external-ca flag is provided, require a --ca-cert flag as well, otherwise
   the external CA is set but the CA certificate is actually rotated to an internal
   cert
2. If a --ca-cert flag is provided, require a --ca-key or --external-ca flag be
   provided as well, otherwise either the server will say that the request is
   invalid, or if there was previously an external CA corresponding to the cert, it
   will succeed.  While that works, it's better to require the user to explicitly
   set all the parameters of the new desired root CA.

This also changes the `swarm update` function to set the external CA's CACert field,
which while not strictly necessary, makes the CA list more explicit.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 4243440e1f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-10 01:32:52 +02:00
Andrew Hsu
ebd85b10e2 Merge pull request #1190 from tiborvass/18.06-vndr 
[18.06] vendor: docker/docker to docker/engine 0d029b0
v18.06.0-ce-rc2 		2018-07-05 18:29:29 -07:00
Tibor Vass
8f5f3adf49 vendor: docker/docker moby/buildkit containerd/containerd containerd/console containerd/continuity opencontainers/runc 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2018-07-05 18:23:07 +00:00
Andrew Hsu
9fbab758a9 Merge pull request #1185 from tiborvass/18.06-cp 
[18.06] build: --iidfile support with buildkit
 2018-07-05 11:06:11 -07:00
Andrew Hsu
b3d8fd5261 Merge pull request #1181 from thaJeztah/18.06-bump-kubernetes-1.8.14 
[18.06] Bump kubernetes dependencies to 1.8.14
 2018-07-05 08:47:14 -07:00
Sebastiaan van Stijn
a7c8c474b9 Merge pull request #1174 from thaJeztah/18.06-backport-no-need-to-check-files 
[18.06] Remove composefiles lenght check on k8s RunDeploy..
 2018-07-05 16:35:54 +02:00
Silvin
5f42140bab Merge pull request #1184 from thaJeztah/18.06-backport-credentials 
[18.06] backport credential-helper fixes
 2018-07-05 15:23:36 +02:00
Tibor Vass
ad80af43d0 Merge pull request #1187 from thaJeztah/18.06-buildkit-buildkit-envvar-zero 
[18.06] build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0"
 2018-07-03 17:10:35 -07:00
Tibor Vass
359d5c8a76 build: use strconv.ParseBool to parse DOCKER_BUILDKIT to allow value "0" 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 721000e6c9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-04 01:29:55 +02:00
Euan Kemp
08479b0776 config/credentials: don't run 'pass' to detect it 
'CheckInitialized' in the credential-helper library actually invokes
`pass`, which isn't desirable (see #699).

This moves the check to be simpler, and then pass will only be invoked
when it's needed (such as for `docker login` or when pulling from a
private registry).

This logic could also reasonably live in the credential-helper library,
but it's simple enough it seems fine in either location.

Signed-off-by: Euan Kemp <euank@euank.com>
(cherry picked from commit 056015c3d8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-07-04 00:51:28 +02:00