toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,683 Commits 3 Branches 295 Tags
2e95726fa5f3d8a6f1c78f45bb26251d65d37cbe
Commit Graph
40115 Commits
Author SHA1 Message Date
GordonTheTurtle 2e95726fa5 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-27 21:04:16 +00:00
Olaf Meeuwissen ffc8511d04 Restore SysVinit and Upstart support 
This was removed in 662e248f680eb49a9951a8b34125506b8f82dfed.  The
removal breaks usage on Debian derivatives that do not use systemd
(see https://github.com/docker/for-linux/issues/482).
Upstream-commit: 196c4028288ad241f52201d0f171c251ed13b98f
Component: packaging
 2018-12-23 20:12:09 +09:00
GordonTheTurtle 2df4905f67 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-12-19 16:37:00 +00:00
GordonTheTurtle 8053e79119 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-18 13:04:01 +00:00
Sebastiaan van Stijn 2b827d4782 Remove obsolete "selinux" and "engine" packages from CLI rpm 
The CLI package does not provide the functionality of the
"selinux" and "engine" packages (it does _conflict_ with
older engine packages though).

This removes the "obsoletes" from the CLI package, as the
Engine package already obsoletes the other ones.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d4e1ddb963a43ff9f0a06e4ed1b37307c8f26a17)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9e6f124b6b5deba3878ad242661d1991881f33b9
Component: packaging
 2018-12-17 18:04:48 +01:00
GordonTheTurtle f5e87b54df Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-17 17:00:57 +00:00
Ian Campbell 7e7a37e63e e2e: assign a default value of 0 to DOCKERD_EXPERIMENTAL 
Currently running the e2e tests produces a warning/error:

    $ make -f docker.Makefile test-e2e
    «...»
    docker run --rm -v /var/run/docker.sock:/var/run/docker.sock docker-cli-e2e
    ./scripts/test/e2e/run: line 20: test: : integer expression expected

This is from:

    test "${DOCKERD_EXPERIMENTAL:-}" -eq "1" && «...»

Where `${DOCKERD_EXPERIMENTAL:-}` expands to the empty string, resulting in
`test "" -eq "1"` which produces the warning. This error is enough to trigger
the short-circuiting behaviour of `&&` so the result is as expected, but fix
the issue nonetheless by provdiing a default `0`.

Signed-off-by: Ian Campbell <ijc@docker.com>
(cherry picked from commit 4f483276cf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c462e06fcd
Component: cli
 2018-12-17 17:23:04 +01:00
Akihiro Suda 130caf6e0e connhelper: add e2e 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 9b148db87a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 719508a935
Component: cli
 2018-12-17 17:22:58 +01:00
Tonis Tiigi dba1b4aeda libcontainerd: prevent exec delete locking 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 332f134890246cfc73703b2911c9fdc20e063096)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 6646d0878247b1e0875da33da606283f5d16ea07
Component: engine
 2018-12-17 12:07:32 +00:00
Andrew Hsu b00fb7cf05 Revert "Propagate context to exec delete" 
This reverts commit b6430ba41388f0300ceea95c10738cbe1a9a7b10.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a9ae6c7547466f754da01a53c6be455c555e6102
Component: engine
 2018-12-17 12:06:35 +00:00
GordonTheTurtle af73095ae2 Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-16 13:01:50 +00:00
Andrew Hsu 9f8d1a9995 Merge pull request #139 from andrewhsu/ctxt 
[18.09] Propagate context to exec delete
Upstream-commit: cc7773c787f400e7b11472878c3a1e55823e9c46
Component: engine
 2018-12-16 11:14:58 +00:00
Andrew Hsu 4f1cf45af7 Merge pull request #138 from andrewhsu/cont 
[18.09] Update containerd to aa5e000c963756778ab3ebd1a12c6
Upstream-commit: b2185081d90d6e192880a33dd0cc581a6bf81539
Component: engine
 2018-12-16 11:14:33 +00:00
GordonTheTurtle b60801e6d4 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09 2018-12-15 01:03:25 +00:00
GordonTheTurtle 2eaec5333d Merge component 'engine' from git@github.com:docker/engine 18.09 2018-12-15 01:03:13 +00:00
GordonTheTurtle 3898ef4957 Merge component 'cli' from git@github.com:docker/cli 18.09 2018-12-15 00:37:01 +00:00
Andrew Hsu 95c87c410e Merge pull request #137 from thaJeztah/18.09_bump_golang_1.10.6 
[18.09] Bump Golang 1.10.6 (CVE-2018-16875)
Upstream-commit: a6d4103450982521dbda0229d2f534e5717bfe63
Component: engine
 2018-12-14 23:23:09 +00:00
Michael Crosby f72ff31415 Propagate context to exec delete 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit 96e0ba1afb228b48aa6e08a90cfc665083d24ccc)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: b6430ba41388f0300ceea95c10738cbe1a9a7b10
Component: engine
 2018-12-14 22:54:46 +00:00
Michael Crosby e775f2a03d Update containerd to aa5e000c963756778ab3ebd1a12c6 
This includes a patch on top of containerd 1.2.1 to handle fifo
timeouts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit e5d9d721626958a37dccfa0b234d9fc96d8c2bfb)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: d161dfe1a36929a03ee3dfa916d296abfd4ccef1
Component: engine
 2018-12-14 22:47:44 +00:00
Sebastiaan van Stijn c86a836fc4 Bump Golang 1.10.6 (CVE-2018-16875) 
go1.10.6 (released 2018/12/14)

- crypto/x509: CPU denial of service in chain validation golang/go#29233
- cmd/go: directory traversal in "go get" via curly braces in import paths golang/go#29231
- cmd/go: remote command execution during "go get -u" golang/go#29230

See the Go 1.10.6 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.10.6

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6c3a10aaed
Component: cli
 2018-12-14 01:41:33 +01:00
Eli Uriegas 2b2dcff273 bump to golang 1.10.6 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 010a8c218dacf18f97aa976ac17c3863ec36b9d5)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: d5e1848a813b3019e44db7581848a66869972e56
Component: packaging
 2018-12-13 23:53:43 +00:00
Sebastiaan van Stijn 3e105499c9 Bump Golang 1.10.6 (CVE-2018-16875) 
go1.10.6 (released 2018/12/14)

- crypto/x509: CPU denial of service in chain validation golang/go#29233
- cmd/go: directory traversal in "go get" via curly braces in import paths golang/go#29231
- cmd/go: remote command execution during "go get -u" golang/go#29230

See the Go 1.10.6 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.10.6

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8afe9f422dc0183ce48e1db09189ccbde634080a
Component: engine
 2018-12-14 00:44:49 +01:00
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
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
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
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
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