toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,655 Commits 3 Branches 295 Tags
7dd1629b208b27f8249e7d9c8b37f86ecc0503ce
Commit Graph
42655 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
GordonTheTurtle 7dd1629b20 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-13 13:02:52 +00:00
GordonTheTurtle 29b8f24be7 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-12-13 12:37:03 +00:00
Andrew Hsu 35ae1fc05c Merge pull request #130 from thaJeztah/18.09_backport_fix_api_return_code 
[18.09 backport] API: fix status code on conflicting service names
Upstream-commit: 42b58273f68c8240e25f1642e6add6435b894e87
Component: engine
 2018-12-13 10:54:52 +00:00
Andrew Hsu fbe190c787 Merge pull request #132 from thaJeztah/18.09_backport_idprefix 
[18.09 backport] fixes display text in Multiple IDs found with provided prefix
Upstream-commit: a8572d3e8e1e3f738d6e9bc3bf0f137d64bab616
Component: engine
 2018-12-13 10:53:54 +00:00
Andrew Hsu ed161fafa9 Merge pull request #136 from thaJeztah/18.09_backport_fix_panic 
[18.09 engine] registry: use len(via)!=0 instead of via!=nil
Upstream-commit: 01c732d40a3f67bed801f8fd4b62f3dbc035b788
Component: engine
 2018-12-13 10:43:38 +00:00
Andrew Hsu 6e20a0f6df Merge pull request #1567 from thaJeztah/18.09_backport_fix_panic_on_update 
[18.09 backport] Fix panic (npe) when updating service limits/reservations
Upstream-commit: 3ee6755815
Component: cli
 2018-12-13 10:39:37 +00:00
Sebastiaan van Stijn 055b2b5a9f Fix panic (npe) when updating service limits/reservations 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 579bb91853)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 16349f6e33
Component: cli
 2018-12-13 02:22:43 +01:00
Iskander (Alex) Sharipov 79cbff3cd3 registry: use len(via)!=0 instead of via!=nil 
This avoids the corner case where `via` is not nil, but has a length of 0,
so the updated code does not panic in that situation.

Signed-off-by: Iskander Sharipov <quasilyte@gmail.com>
(cherry picked from commit a5c185b99404ea3fbab47ff9d7ba143392566bc1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3482a3b14a6414977bd9860c513abf06dedd6bf7
Component: engine
 2018-12-12 18:12:01 +01:00
GordonTheTurtle 6021a0fde8 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-12 17:02:58 +00:00
Andrew Hsu c8cccde1d5 Merge pull request #133 from thaJeztah/18.09_backport_fix_ipam_swagger 
[18.09 backport] Swagger: fix definition of IPAM driver options
Upstream-commit: 1ffccb515a9ec4b19c2ff66637c2469c62875ab1
Component: engine
 2018-12-12 16:24:46 +00:00
Sebastiaan van Stijn 36f2444328 Swagger: fix definition of IPAM driver options 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a5dd68186cc54ab43b0b73cd7ee3bdf923f70d3b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 55a4be8cf5787f88c1ce6bc3e2ec73402c964e5d
Component: engine
 2018-12-12 01:59:01 +01:00
Lifubang 50be23f5a1 fixes display text in Multiple IDs found with provided prefix 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
(cherry picked from commit 00eb3480dc4ceb6034f8f7463ff41d2e87fb5dcc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1043f40fb561ffbf23fbdde9989abcebd8e48279
Component: engine
 2018-12-11 15:15:20 +01:00
GordonTheTurtle 6176e25a23 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-10 17:05:10 +00:00
Andrew Hsu b412443ed2 Merge pull request #131 from tonistiigi/1809-update-buildkit 
[18.09 backport] vendor: update buildkit to d9f75920
Upstream-commit: d21754a3fb453451c521ddc51df6cf109102d74c
Component: engine
 2018-12-10 16:29:04 +00:00
Andrew Hsu aafd3c7cec Merge pull request #129 from thaJeztah/18.09_backport_bump_containerd_vendoring 
[18.09 backport] update containerd vendoring to v1.2.1
Upstream-commit: b54b6d145ccfd5a47b774cd4205b48b3ff090afa
Component: engine
 2018-12-10 13:54:05 +00:00
Tonis Tiigi e27956be04 vendor: update buildkit to d9f75920 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 32f48058158cce7a6a1f8f0d1526d8224b369cbc)
Upstream-commit: 43dedf397503532f8bc1313af82a9356ed8c3550
Component: engine
 2018-12-10 13:03:13 +00:00
Sebastiaan van Stijn 6155a653aa Add test for status code on conflicting service names 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b0de11cf3018b482dfcf8c873261dc11c8fce0b0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a69626afb12eb9ec3e374aa563b561c0ba28f27f
Component: engine
 2018-12-10 12:21:26 +01:00
Sebastiaan van Stijn c99df606e6 Update swarmkit to return correct error-codes on conflicting names 
This updates the swarmkit vendoring to the latest version in the bump_v18.09
branch

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ad7105260f3c2ff32a375ff78dce9a96e01d87cb
Component: engine
 2018-12-10 12:18:32 +01:00
GordonTheTurtle 3342cdc4ba Merge component 'cli' from git@github.com:docker/cli 18.09 2018-12-08 00:36:54 +00:00
Brian Goff 6290aed85c Merge pull request #1554 from thaJeztah/18.09_backport_completion-import--platform 
[18.09 backport] Add bash completion for `import --platform`
Upstream-commit: 2aa77af30f
Component: cli
 2018-12-07 13:10:27 -08:00
Brian Goff 4dce161c07 Merge pull request #1553 from thaJeztah/18.09_backport_completion-log-driver-local 
[18.09 backport] Add bash completion for "local" log driver
Upstream-commit: 456c1ce695
Component: cli
 2018-12-07 13:10:06 -08:00
GordonTheTurtle 0464f48da5 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-12-07 20:36:48 +00:00
Harald Albers 0cbda9f762 Add bash completion for import --platform 
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e0fe546c37)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bcadc9061c
Component: cli
 2018-12-07 20:08:35 +01:00
Harald Albers f0885d1fab Add bash completion for "local" log driver 
Ref: https://github.com/moby/moby/pull/37092

Also adds log-opt `compress` to json-file log driver because this was
also added in the referenced PR.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit c59038b15c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e05745b4a5
Component: cli
 2018-12-07 20:05:08 +01:00
Sebastiaan van Stijn 72b3a61238 Merge pull request #1552 from thaJeztah/18.09_backport_fix_filter_panic 
[18.09 backport] Fix panic when pruning images with label-filter
Upstream-commit: b6ecef353f
Component: cli
 2018-12-07 19:29:32 +01:00
Andrew Hsu c9df8f4688 use empty string as cgroup path to grab first find 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 78045a5419718ba8884ed5afc0b41a3a80afc3b4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b66c7ad62ebff12112318db0d1ed48b14f817efa
Component: engine
 2018-12-07 18:58:03 +01:00
Andrew Hsu 42b5bd7c0f vndr libnetwork to adjust for updated runc 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 75c4b741550a3c5cb061269cc92a5d563d153626)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5cd4797c89383159219716de92775138c2dd17c5
Component: engine
 2018-12-07 18:57:54 +01:00
Andrew Hsu 9f0f7c271c update containerd to v1.2.1 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 615eecf8ac2a49385e346631e97850830360b8cf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7dfd23acf1d604cde70d46e36bfe2e51df2dcf46
Component: engine
 2018-12-07 18:45:14 +01:00
GordonTheTurtle 75d17684b1 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-07 17:04:01 +00:00
Sebastiaan van Stijn 1a759e5769 Fix panic when pruning images with label-filter 
Before this change:

    docker image prune --force --filter "label=foobar"
    panic: assignment to entry in nil map

    goroutine 1 [running]:
    github.com/docker/cli/vendor/github.com/docker/docker/api/types/filters.Args.Add(...)
    /go/src/github.com/docker/cli/vendor/github.com/docker/docker/api/types/filters/parse.go:167
    github.com/docker/cli/cli/command/image.runPrune(0x1db3a20, 0xc000344cf0, 0x16e0001, 0xc00015e600, 0x4, 0x3, 0xc00024e160, 0xc000545c70, 0x5ab4b5)
    /go/src/github.com/docker/cli/cli/command/image/prune.go:79 +0xbaf
    github.com/docker/cli/cli/command/image.NewPruneCommand.func1(0xc00029ef00, 0xc0004a8180, 0x0, 0x3, 0x0, 0x0)
    /go/src/github.com/docker/cli/cli/command/image/prune.go:32 +0x64
    github.com/docker/cli/vendor/github.com/spf13/cobra.(*Command).execute(0xc00029ef00, 0xc000038210, 0x3, 0x3, 0xc00029ef00, 0xc000038210)
    /go/src/github.com/docker/cli/vendor/github.com/spf13/cobra/command.go:762 +0x473
    github.com/docker/cli/vendor/github.com/spf13/cobra.(*Command).ExecuteC(0xc000127180, 0xc000272770, 0x1836ce0, 0xc000272780)
    /go/src/github.com/docker/cli/vendor/github.com/spf13/cobra/command.go:852 +0x2fd
    github.com/docker/cli/vendor/github.com/spf13/cobra.(*Command).Execute(0xc000127180, 0xc000127180, 0x1d60880)
    /go/src/github.com/docker/cli/vendor/github.com/spf13/cobra/command.go:800 +0x2b
    main.main()
    /go/src/github.com/docker/cli/cmd/docker/docker.go:180 +0xdc

With this patch applied:

    docker image prune --force --filter "label=foobar"
    Total reclaimed space: 0B

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1e1dd5bca4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e380ddaddf
Component: cli
 2018-12-07 17:58:38 +01:00
Andrew Hsu c19e3d0b29 Merge pull request #128 from thaJeztah/18.09_backport_containerd_v1.2.1-GA 
[18.09 backport] update just installer of containerd to 1.2.1
Upstream-commit: 6c633fbe18e0a69db3db1aed28b3fa23bc795dfe
Component: engine
 2018-12-07 06:18:48 -08:00
Andrew Hsu 37a56d2599 update just installer of containerd to 1.2.1 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 1014b2bb66050a11bba833349346b35e6472688b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2c64d7c858b5fd16d0d14d692a3765cf8d5a5d7e
Component: engine
 2018-12-07 11:20:22 +01:00
Andrew Hsu bca00687d8 Merge pull request #571 from andrewhsu/rc1 
[18.09] bump ver 18.09.1-rc1 and update changelog
 2018-12-06 18:12:05 -08:00
Andrew Hsu fe0ed1581f bump ver 18.09.1-rc1 and update changelog 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-12-06 23:45:38 +00:00
GordonTheTurtle 7bdb3c6b87 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-05 21:03:38 +00:00
Andrew Hsu 66c694875f Merge pull request #280 from thaJeztah/18.09_backport_remove_spec 
[18.09 backport] Remove unused spec files
Upstream-commit: abbaa92613ec98ce92b7d868975f67bb1927d693
Component: packaging
 2018-12-05 11:38:57 -08:00
Eli Uriegas 89559b9c3c Remove unused spec files 
We don't use these spec files to actually build from anymore so we
should just go through and remove them.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit b98d7aad1e153c18da5b488afc40ba751f90cb36)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9d68fe72f3649fad5e3f902602c8ae9ab4a6abe5
Component: packaging
 2018-12-05 15:12:29 +01:00
Eli Uriegas 74239bfbe1 Merge pull request #570 from andrewhsu/b2 
[18.09] bump ver 18.09.1-beta2
 2018-12-03 16:12:12 -08:00
GordonTheTurtle 24b031ea42 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-03 23:53:35 +00:00
GordonTheTurtle 64e00cdf94 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-03 23:53:23 +00:00
GordonTheTurtle 6d1bca6a6c Merge component 'cli' from git@github.com:docker/cli 18.09 2018-12-03 23:26:41 +00:00
Andrew Hsu 129720636e bump ver 18.09.1-beta2 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2018-12-03 23:26:14 +00:00
Andrew Hsu dce40a7ca6 Merge pull request #279 from andrewhsu/golang 
[18.09] bump golang to 1.10.5
Upstream-commit: 47d440b14714e57f8cda9f042299db1d35b2b592
Component: packaging
 2018-12-03 14:49:31 -08:00
Andrew Hsu 11442eb1e7 bump golang to 1.10.5 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit c658dc545952bf4728e0ef3ff281bfa8823d60cb)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: df92c55b0ceefb75736d5d1f31a13f8400534a8b
Component: packaging
 2018-12-03 22:21:44 +00:00
Andrew Hsu 679c1150b8 Merge pull request #126 from thaJeztah/18.09_backport_mask_asound 
[18.09 backport] Masked /proc/asound
Upstream-commit: 82a4418f57d5aa0d58c8bba630d701a918094c3b
Component: engine
 2018-12-03 14:06:43 -08:00
Andrew Hsu 66abfda9b2 Merge pull request #1542 from thaJeztah/18.09_backport_completion_cli_experimental 
[18.09 backport] Add bash completion for experimental CLI commands (manifest)
Upstream-commit: 12834eeff6
Component: cli
 2018-12-03 13:34:56 -08:00
GordonTheTurtle 46a88fbe88 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-03 21:04:39 +00:00
docker-unir[bot] 5efaa09256 Merge pull request #276 from andrewhsu/sock 
Merged with https://github.com/seemethere/unir
Upstream-commit: be8c06f8a7ebaec9e7d30663c82131e0e2ae1aac
Component: packaging
 2018-12-03 19:45:33 +00:00
Eli Uriegas 9b0d684d7f Add docker.socket requirement for docker.service 
Without this the docker.socket would not start by default when starting
the docker.service leading to failures to start.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 88885d18b1bb0ef91eab4ad3311773f9c40838b7)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 93f125a2602b7eb72128cbc16d9d35c9d92ed18a
Component: packaging
 2018-12-03 19:42:41 +00:00
docker-unir[bot] ffd5999784 Merge pull request #260 from thaJeztah/18.09_remove_telemetry_remnants 
Merged with https://github.com/seemethere/unir
Upstream-commit: 091c4453b8e294b0e10ea9fe24c784c2086719be
Component: packaging
 2018-12-03 19:40:52 +00:00