starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-26 01:10:35 -04:00
Code Issues Packages Projects Releases Wiki Activity
42,891 Commits 15 Branches 323 Tags
3f0e4c75b00ae105304f0ad5dfd6cb28b24dd361
Commit Graph
42891 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 3f0e4c75b0 Merge component 'engine' from git@github.com:docker/engine 18.09 2019-04-22 01:06:45 +00:00
Sebastiaan van Stijn a1ca42a629 Merge pull request #191 from thaJeztah/18.09_backport_windows_ci_fixes 
[18.09 backport] windows.ps1 fixes
Upstream-commit: e2352b11c7c1459a06dadf8045a7779ffaafa2ad
Component: engine
 2019-04-22 00:28:49 +02:00
GordonTheTurtle 183cc3650c Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2019-04-13 00:59:46 +00:00
GordonTheTurtle d8c7e6f27c Merge component 'engine' from git@github.com:docker/engine 18.09 2019-04-13 00:59:34 +00:00
Sebastiaan van Stijn 9f913c7e8c Merge pull request #187 from thaJeztah/18.09_bump_buildkit 
[18.09] bump buildkit ed4da8b4a9661f278ae8433056ca37d0727c408b (docker-18.09 branch)
Upstream-commit: 1c4d9ccda690711fbc42cfc93bdd00fe7bc0a3ae
Component: engine
 2019-04-12 23:15:11 +02:00
Eli Uriegas e89bd1ab59 Merge pull request #319 from StefanScherer/add-platform-for-deb-and-rpm-1809 
[18.09] Add PLATFORM to deb and rpm builds
Upstream-commit: 33c01db93f4fe71c75b3b1e0d036e7d0987822cc
Component: packaging
 2019-04-12 13:36:51 -07:00
Andrew Hsu e8ff056dbc Merge pull request #595 from andrewhsu/1809ga 
[18.09] bump ver 18.09.5 ga
 2019-04-10 16:47:39 -07:00
Andrew Hsu 716dfd0d14 bump ver 18.09.5 ga 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2019-04-10 15:52:33 +00:00
Stefan Scherer 591f85d1f1 Add PLATFORM to deb and rpm build 
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
(cherry picked from commit 119bb518ff5bf382b29971805f5c7ba16f960b21)
Upstream-commit: 6d0273d5c0ffd30c3cefd9caca61595f235dc01e
Component: packaging
 2019-04-09 07:34:48 +02:00
Andrew Hsu 351eb87d50 Merge pull request #594 from andrewhsu/1809rc1 
[18.09] bump ver 18.09.5-rc1 and update changelog
 2019-04-08 19:52:16 -07:00
Andrew Hsu 6535618de5 bump ver 18.09.5-rc1 and update changelog 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2019-04-09 00:45:30 +00:00
GordonTheTurtle ae0be04ddb Merge component 'engine' from git@github.com:docker/engine 18.09 2019-04-08 16:59:18 +00:00
Andrew Hsu 52cc9db4e0 Merge pull request #192 from mavenugo/18.09_ln_vndr 
[18.09 backport] Vendor Libnetwork c902989
Upstream-commit: 50ebe4562dfce3c7dfeeb5c0d2695b23879162c1
Component: engine
 2019-04-08 08:09:54 -07:00
Madhu Venugopal e62ff169e1 Vendor Libnetwork c902989 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: a9e2f27bf0bdb335bd1619cccfea889a76c949e5
Component: engine
 2019-04-07 09:37:15 -07:00
xichengliudui a4740d20e2 Delete duplicate words 
update pull request

Signed-off-by: “xichengliudui” <“liuduidui@beyondcent.com”>
(cherry picked from commit 1d62807db3bcbb3d793a5bb396d17aa62a59537c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 74f9183764f7ce1c54223288addfcdd901c86a27
Component: engine
 2019-04-05 20:21:05 +02:00
John Howard 29951b1046 Windows CI: Dump possible panic log 
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit bc80e8df3e6300354305f81a4c0c48b855a1776b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d5a0ffa172a012e388d5b31edf332acc264b39b6
Component: engine
 2019-04-05 20:20:54 +02:00
Sebastiaan van Stijn 8332f4444c PowerShell: fix "Nuke-Everything" failing to remove images 
I noticed this error in CI:

```
20:37:25 INFO: Non-base image count on control daemon to delete is 9
20:37:25 "docker rmi" requires at least 1 argument.
20:37:25 See 'docker rmi --help'.
20:37:25
20:37:25 Usage:  docker rmi [OPTIONS] IMAGE [IMAGE...]
20:37:25
20:37:25 Remove one or more images
```

Which indicated that the PowerShell script managed to find images to delete, but
not actually passing the images to `docker rmi`.

The reason for this failing was that the script attempted to convert the
collection/array to a string, which produces;

```powershell
Write-Output $(docker images --format "{{.Repository}}:{{.ID}}" | `
>>         select-string -NotMatch "windowsservercore" | `
>>         select-string -NotMatch "nanoserver" | `
>>         select-string -NotMatch "docker" `
>>         ).ToString()
System.Object[]
```

Which, when trying to split by the chosen separator (`:`), will return the same;

```powershell
Write-Output "System.Object[]".Split(":")[0]
```

This patch:

- Adds an intermediate variable (`$allImages`) to make the code better readable
- Switches the separator to `#`, to prevent breaking on images pulled from a
  repository with a port in its name (`myregistry:5000/my/image`)
- Switches to use a comma-separated list for `-NotMatch` (for readability)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5580b79813d3a5d2a7b83bcf1607839a5b0f468d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 74fe2c044f56e58356e9f598e5b08d94e676bbd4
Component: engine
 2019-04-05 20:20:31 +02:00
Sebastiaan van Stijn 8dea19efd5 PowerShell: Go-version check; only select the first match 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 755d3057ab8917c37e33bb5aa60c37cbe51285dd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 431dc221e3a22b9f97d691dffcc815a5998c0a34
Component: engine
 2019-04-05 20:20:21 +02:00
Sebastiaan van Stijn 09e8b14556 PowerShell: remove aliases, use their real commands instead 
This patch replaces PowerShell aliases for their real commands, see https://blogs.technet.microsoft.com/heyscriptingguy/2012/04/21/when-you-should-use-powershell-aliases/

For example;

- use `Get-Location` instead of `pwd`
- use `Set-Location` instead of `cd`
- use `ForEach-Object` instead of the `%` shorthand
- use `Write-Output` instead of `echo`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6130c89ccec5262c25b91b3226a6ef2240bfde3b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f0911d9122bf73d7efb90a50444cd6e52a09a96
Component: engine
 2019-04-05 20:20:11 +02:00
Sebastiaan van Stijn ee1373b5cf PowerShell: move $null to left-hand for comparisons 
see https://rencore.com/blog/powershell-null-comparison/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b394d25f03ee6ab615e45aad35e6396efd7d7fea)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 31d99be110c0a19ffc631355bac58bf8a7b068e1
Component: engine
 2019-04-05 20:20:02 +02:00
Sebastiaan van Stijn ab9341ba9a PowerShell: fix mixed tabs/spaces 
Fixed some mixed/tabs spaces for indentation, and used
tabs for auto-generated Go code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0f8b616c0c8f959ac4b29f29a8716b8cb7ea28fd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 73e5951b2e3c13ce84781d28b08cdc1958fb6224
Component: engine
 2019-04-05 20:19:53 +02:00
GordonTheTurtle f683faf94b Merge component 'cli' from git@github.com:docker/cli 18.09 2019-04-02 08:36:50 +00:00
Silvin Lubecki 3778127afa Merge pull request #1795 from thaJeztah/18.09_backport_dialstdio_1736 
[18.09 backport] dial-stdio: fix goroutine leakage
Upstream-commit: c89750f836
Component: cli
 2019-04-02 10:26:42 +02:00
Silvin Lubecki 48166d2ecb Merge pull request #1794 from thaJeztah/18.09_backport_fix_stack_watch 
[18.09 backport] Fix the stack informer's selector used to track deployment
Upstream-commit: c805ad2964
Component: cli
 2019-04-02 10:24:41 +02:00
Akihiro Suda 4f1c087345 dial-stdio: fix goroutine leakage 
Fix #1736

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit f8d4c443ba)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d8c6c830f8
Component: cli
 2019-04-02 00:25:24 +02:00
Simon Ferquel 515ac23e13 Fix the stack informer's selector used to track deployment 
Old selector was wrong (it watched for the label we applied to child
resources when reconciling the stack, instead of the stack itself)

This should be back-ported to older version of the CLI

Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
(cherry picked from commit 8cd74eb33a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f89d05edcb
Component: cli
 2019-04-01 18:23:43 +02:00
GordonTheTurtle 8e07ba51b7 Merge component 'engine' from git@github.com:docker/engine 18.09 2019-03-29 00:59:15 +00:00
Sebastiaan van Stijn 2bbe5b06e2 bump buildkit ed4da8b4a9661f278ae8433056ca37d0727c408b (docker-18.09 branch) 
brings in moby/buildkit#911 [docker-18.09] llbsolver: fix selectors dedupe
(backport of https://github.com/moby/buildkit/pull/858)

fixes https://github.com/moby/moby/issues/38964

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 083da4862d9c88b3b40d6f4e1b21f6ce76920fd6
Component: engine
 2019-03-29 01:41:32 +01:00
GordonTheTurtle d2a29ca9f2 Merge component 'cli' from git@github.com:docker/cli 18.09 2019-03-29 00:36:51 +00:00
Andrew Hsu d5e6ddb355 Merge pull request #185 from thaJeztah/18.09_backport_fix_leaking_task_resources 
[18.09] bump docker/swarmkit 19e791fd6dc76e8e894cbc99 (18.09 branch)
Upstream-commit: 1046c6371132875d80f287950bb9e9e5cefa8a85
Component: engine
 2019-03-28 16:58:46 -07:00
Andrew Hsu 044022b8c7 Merge pull request #1788 from thaJeztah/18.09_backport_annotations 
[18.09 backport] fix annotations on --template-driver
Upstream-commit: e1fe8f3c45
Component: cli
 2019-03-28 16:50:17 -07:00
Sune Keller 8054c5a69b Fix annotation on docker secret create --template-driver 
Signed-off-by: Sune Keller <absukl@almbrand.dk>
(cherry picked from commit 217308d96d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 356eda4028
Component: cli
 2019-03-29 00:33:02 +01:00
Simon Ferquel 1617714f28 Fix annnotation on docker config create --template-driver 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
(cherry picked from commit 470afe11ed)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 85148aa3f1
Component: cli
 2019-03-29 00:32:44 +01:00
Sebastiaan van Stijn 2a10e0280c bump docker/swarmkit 19e791fd6dc76e8e894cbc99b77f946b7d00ebb9 (18.09 branch) 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c36238036388eb5ef0b92af7eb8036ee8aadbffd
Component: engine
 2019-03-28 22:06:24 +01:00
GordonTheTurtle a11331142f Merge component 'engine' from git@github.com:docker/engine 18.09 2019-03-28 20:58:53 +00:00
GordonTheTurtle 545a63d20f Merge component 'cli' from git@github.com:docker/cli 18.09 2019-03-28 20:36:41 +00:00
Andrew Hsu 7d07a796f3 Merge pull request #1775 from thaJeztah/18.09_backport_ttyexecresize 
[18.09 backport] fixes 1492: tty initial size error
Upstream-commit: 19c0311d46
Component: cli
 2019-03-28 10:20:48 -07:00
Andrew Hsu 8677ecab79 Merge pull request #1776 from thaJeztah/18.09_backport_upgrade_shellcheck_0.6.0 
[18.09 backport] use official shellcheck 0.6.0, and don't patch Dockerfiles in CI
Upstream-commit: 207ff0831d
Component: cli
 2019-03-28 10:19:59 -07:00
Andrew Hsu 4c39df1955 Merge pull request #180 from thaJeztah/18.09_backport_fix_net_host_systemd_resolved 
[18.09 backport] Fix: network=host using wrong resolv.conf with systemd-resolved
Upstream-commit: 80e10316cd01832a0fe04bc7970569bf86c3e391
Component: engine
 2019-03-28 10:17:58 -07:00
GordonTheTurtle feaf3c02f0 Merge component 'engine' from git@github.com:docker/engine 18.09 2019-03-28 17:00:35 +00:00
Andrew Hsu eeb745937a Merge pull request #176 from AkihiroSuda/38902-1809 
[18.09 backport] builder-next: fix squash
Upstream-commit: 8c0845a508e4e14659c82761aa7ec578d551004b
Component: engine
 2019-03-28 09:38:37 -07:00
Andrew Hsu bd877991d7 Merge pull request #178 from thaJeztah/18.09_backport_exec_spec 
[18.09 backport] Use original process spec for execs
Upstream-commit: b4bf217633d7884999b675b8a7b9b81892b46086
Component: engine
 2019-03-28 09:37:29 -07:00
Andrew Hsu f6c192f8d4 Merge pull request #181 from thaJeztah/18.09_backport_fix_stopped_restart_containers 
[18.09 backport] Fix stopped containers with restart-policy showing as "restarting"
Upstream-commit: 160b62e7a5375d11519e54009b450a4ad20ef8ba
Component: engine
 2019-03-28 09:10:59 -07:00
Andrew Hsu d14af54266 Merge pull request #591 from andrewhsu/1809ga 
[18.09] bump ver 18.09.4
 2019-03-27 10:38:27 -07:00
Andrew Hsu b842af1c2b bump ver 18.09.4 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2019-03-27 16:50:31 +00:00
GordonTheTurtle fae8ec96bd Merge component 'cli' from git@github.com:docker/cli 18.09 2019-03-27 16:36:55 +00:00
Andrew Hsu 1b7a5a4e5a Merge pull request #1778 from thaJeztah/18.09_bump_engine 
[18.09] bump engine 200b524eff60a9c95a22bc2518042ac2ff617d07 (18.09 branch)
Upstream-commit: 57b27434ea
Component: cli
 2019-03-27 08:28:02 -07:00
Sebastiaan van Stijn b3b20effb4 bump engine 200b524eff60a9c95a22bc2518042ac2ff617d07 (18.09 branch) 
relevant changes;

- moby/moby#38006 / docker/engine#114 client: use io.LimitedReader for reading HTTP error
- moby/moby#38634 / docker/engine#167 pkg/archive:CopyTo(): fix for long dest filename
  - fixes docker/for-linux#484 for 18.09
- moby/moby#38944 / docker/engine#183 gitutils: add validation for ref
- moby/moby#37780 / docker/engine#55 pkg/progress: work around closing closed channel panic
  - addresses moby/moby#/37735 pkg/progress: panic due to race on shutdown

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 010c234a0d
Component: cli
 2019-03-27 10:08:23 +01:00
GordonTheTurtle 7f56899677 Merge component 'engine' from git@github.com:docker/engine 18.09 2019-03-27 09:03:31 +00:00
Sebastiaan van Stijn 356af1ef3e Merge pull request #183 from thaJeztah/18.09_backport_gitutils 
[18.09 backport] gitutils: add validation for ref
Upstream-commit: 200b524eff60a9c95a22bc2518042ac2ff617d07
Component: engine
 2019-03-27 09:34:06 +01:00