Andrew Hsu and GitHub
9352be5341
Merge pull request #1694 from thaJeztah/18.09_backport_nolibtool
...
[18.09 backport] Update PKCS11 library
v18.09.3
2019-02-27 08:39:46 -08:00
Justin Cormack and Sebastiaan van Stijn
b4f607fb4f
Update PKCS11 library
...
The new version no longer links to libltdl which simplifies build
and dependencies.
See https://github.com/theupdateframework/notary/pull/1434
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
(cherry picked from commit cb3e55bf58 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2019-02-26 13:17:22 +01:00
Sebastiaan van Stijn and GitHub
af2647d55b
Merge pull request #1634 from thaJeztah/18.09_bump_golang_1.10.8
...
[18.09] Bump Golang 1.10.8 (CVE-2019-6486)
v18.09.3-rc1
v18.09.2
2019-01-24 14:27:59 +01:00
Sebastiaan van Stijn
c71aa11c0a
[18.09] Bump Golang 1.10.8 (CVE-2019-6486)
...
See the milestone for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.10.8+label%3ACherryPickApproved
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2019-01-24 02:07:03 +01:00
Tibor Vass and GitHub
336b2a5cac
Merge pull request #1580 from thaJeztah/18.09_backport_e2e-invocation-nit
...
[18.09 backport] e2e updates
v18.09.1
2018-12-19 14:20:03 +01:00
Ian Campbell and Sebastiaan van Stijn
c462e06fcd
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 >
2018-12-17 17:23:04 +01:00
Akihiro Suda and Sebastiaan van Stijn
719508a935
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 >
2018-12-17 17:22:58 +01:00
Andrew Hsu and GitHub
2fa3aae9ed
Merge pull request #1575 from thaJeztah/bump_golang_1.10.6
...
[18.09] Bump Golang 1.10.6 (CVE-2018-16875)
2018-12-14 20:56:04 +00:00
Sebastiaan van Stijn
6c3a10aaed
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 >
2018-12-14 01:41:33 +01:00
Andrew Hsu and GitHub
3ee6755815
Merge pull request #1567 from thaJeztah/18.09_backport_fix_panic_on_update
...
[18.09 backport] Fix panic (npe) when updating service limits/reservations
2018-12-13 10:39:37 +00:00
Sebastiaan van Stijn
16349f6e33
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 >
2018-12-13 02:22:43 +01:00
Brian Goff and GitHub
2aa77af30f
Merge pull request #1554 from thaJeztah/18.09_backport_completion-import--platform
...
[18.09 backport] Add bash completion for `import --platform`
2018-12-07 13:10:27 -08:00
Brian Goff and GitHub
456c1ce695
Merge pull request #1553 from thaJeztah/18.09_backport_completion-log-driver-local
...
[18.09 backport] Add bash completion for "local" log driver
2018-12-07 13:10:06 -08:00
Harald Albers and Sebastiaan van Stijn
bcadc9061c
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 >
2018-12-07 20:08:35 +01:00
Harald Albers and Sebastiaan van Stijn
e05745b4a5
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 >
2018-12-07 20:05:08 +01:00
Sebastiaan van Stijn and GitHub
b6ecef353f
Merge pull request #1552 from thaJeztah/18.09_backport_fix_filter_panic
...
[18.09 backport] Fix panic when pruning images with label-filter
2018-12-07 19:29:32 +01:00
Sebastiaan van Stijn
e380ddaddf
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 >
2018-12-07 17:58:38 +01:00
Andrew Hsu and GitHub
12834eeff6
Merge pull request #1542 from thaJeztah/18.09_backport_completion_cli_experimental
...
[18.09 backport] Add bash completion for experimental CLI commands (manifest)
v18.09.1-rc1
v18.09.1-beta2
2018-12-03 13:34:56 -08:00
Andrew Hsu and GitHub
bb46da9fba
Merge pull request #1544 from thaJeztah/18.09_bump_go_to_1.10.5
...
[18.09] Bump Go to 1.10.5
v18.09.1-beta1
2018-11-30 14:03:12 -08:00
Sebastiaan van Stijn
871d24d3fc
Bump Go to 1.10.5
...
go1.10.5 (released 2018/11/02) includes fixes to the go command, linker,
runtime and the database/sql package. See the milestone on the issue
tracker for details:
List of changes; https://github.com/golang/go/issues?q=milestone%3AGo1.10.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-11-30 21:59:54 +01:00
Andrew Hsu and GitHub
61a9096b8d
Merge pull request #1540 from thaJeztah/18.09_backport_fix_flags_in_usage
...
[18.09 backport] Fix yamldocs outputing `[flags]` in usage output
2018-11-29 13:26:27 -08:00
Harald Albers and Sebastiaan van Stijn
2ac475cf97
Add bash completion for manifest command family
...
Signed-off-by: Harald Albers <github@albersweb.de >
(cherry picked from commit 0fb4256a00 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-11-29 17:15:06 +01:00
Harald Albers and Sebastiaan van Stijn
2a36695037
Add support for experimental cli features to bash completion
...
This is needed for implementing bash completion for the `docker manifest`
command family.
Signed-off-by: Harald Albers <github@albersweb.de >
(cherry picked from commit a183c952c6 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-11-29 17:15:04 +01:00
Harald Albers and Sebastiaan van Stijn
dc74fc81f2
Refactor usage of docker version in bash completion
...
This preapares bash completion for more context sensitivity:
- experimental cli features
- orchestrator specific features
Also renames _daemon_ to _server_ where used in context of `docker version`
because the fields there are grouped unter _Server_.
Signed-off-by: Harald Albers <github@albersweb.de >
(cherry picked from commit 564d4da06e )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-11-29 17:15:02 +01:00
Sebastiaan van Stijn
7e90635652
Fix yamldocs outputing [flags] in usage output
...
A similar change was made in the CLI itself, but is not
inherited by the code that generates the YAML docs.
Before this patch is applied;
```
usage: docker container exec [OPTIONS] CONTAINER COMMAND [ARG...] [flags]
```
With this patch applied:
```
usage: docker container exec [OPTIONS] CONTAINER COMMAND [ARG...]
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 44d96e9120 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-11-29 15:44:16 +01:00
Andrew Hsu and GitHub
3f7989903a
Merge pull request #1454 from thaJeztah/18.09_backport_defaulttcpschema
...
[18.09 backport] fixes #1441 set default schema to tcp for docker host
2018-11-27 09:32:51 -08:00
Andrew Hsu and GitHub
7059d069c3
Merge pull request #1532 from tiborvass/18.09-fix-system-prune-filters
...
[18.09] prune: move image pruning before build cache pruning
2018-11-26 16:07:21 -08:00
Tibor Vass
4a4a1f3615
prune: move image pruning before build cache pruning
...
This is cleaner because running system prune twice in a row
now results in a no-op the second time.
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit 6c10abb247 )
Signed-off-by: Tibor Vass <tibor@docker.com >
2018-11-21 22:01:54 +00:00
Sebastiaan van Stijn and GitHub
1274f23252
Merge pull request #1531 from thaJeztah/18.09_backport_builder_docs
...
[18.09 backport] builder documentation updates
2018-11-21 18:10:29 +01:00
Tonis Tiigi and Sebastiaan van Stijn
3af1848dda
buildkit reference docs
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 83aeb219f0 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-11-21 17:16:30 +01:00
Brandon Mitchell and Sebastiaan van Stijn
6d91f5d55d
Documenting ENTRYPOINT can empty value of CMD
...
Signed-off-by: Brandon Mitchell <git@bmitch.net >
(cherry picked from commit cc316fde55 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-11-21 17:16:24 +01:00
Sebastiaan van Stijn and GitHub
d56948c12c
Merge pull request #1530 from thaJeztah/18.09_backport_add_logging_driver_example
...
[18.09 backport] Update daemon.json example to show that log-opts must be a string
2018-11-21 17:10:02 +01:00
Sebastiaan van Stijn
9b3eea87ee
Update daemon.json example to show that log-opts must be a string
...
log-opts are passed to logging-drivers as-is, so the daemon is not
aware what value-type each option takes.
For this reason, all options must be provided as a string, even if
they are used as numeric values by the logging driver.
For example, to pass the "max-file" option to the default (json-file)
logging driver, this value has to be passed as a string;
```json
{
"log-driver": "json-file",
"log-opts": {
"max-size": "10m",
"max-file": "3"
}
}
```
When passed as a _number_ (`"max-file": 3`), the daemon will invalidate
the configuration file, and fail to start;
unable to configure the Docker daemon with file /etc/docker/daemon.json: json: cannot unmarshal number into Go value of type string
This patch adds an example to the daemon.json to show these values
have to be passed as strings.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit fd33e0d933 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-11-21 15:34:41 +01:00
Silvin Lubecki and GitHub
31c092e155
Merge pull request #1526 from thaJeztah/18.09_backport_completion_fix_service__force
...
[18.09 backport] Fix bash completion for `service update --force`
2018-11-21 11:38:28 +01:00
Harald Albers and Sebastiaan van Stijn
046ffa4e87
Fix bash completion for service update --force
...
- `--force` is not available in `service create`
- `--force` is a boolean option
Signed-off-by: Harald Albers <github@albersweb.de >
(cherry picked from commit 5fa5eb1da6 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-11-20 18:18:33 +01:00
Silvin Lubecki and GitHub
51668a30f2
Merge pull request #1483 from thaJeztah/18.09_backport_docs_fixes
...
[18.09 backport] various docs fixes
v18.09.0
v18.09.0-rc1
2018-10-26 15:54:26 +01:00
Akihiro Suda and Sebastiaan van Stijn
5e7f9d3c84
docs, ssh: unsupport password auth explicitly
...
The issue with password auth is tracked in #1476 and #1477 .
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
(cherry picked from commit 16b014e062 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:33 +02:00
Brandon Mitchell and Sebastiaan van Stijn
72ddefbada
Documenting example default-ulimit in daemon.json
...
Signed-off-by: Brandon Mitchell <git@bmitch.net >
(cherry picked from commit 3f4f450941 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:31 +02:00
Brandon Mitchell and Sebastiaan van Stijn
135aa72476
Updating rmi doc example to specify latest tag
...
Signed-off-by: Brandon Mitchell <git@bmitch.net >
(cherry picked from commit f913b73c81 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:28 +02:00
Scott Brenner and Sebastiaan van Stijn
7c7fe26a6f
Minor typo fix in run documentation
...
Quick syntax fix!
Signed-off-by: Scott Brenner <scott@scottbrenner.me >
(cherry picked from commit 50143cff12 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:26 +02:00
Jake Lambert and Sebastiaan van Stijn
1df47ffb4d
Clarify in docs that docker tag doesn't publish
...
I am attempting to push a tag to a private repository. The documentation for `docker tag` has an explicit example to for how ["To push an image to a private registry"](https://docs.docker.com/engine/reference/commandline/tag/#tag-an-image-referenced-by-name ). My colleague clarified that this command does not in fact push anything, so I thought this PR might save some future novice the same confusion.
Signed-off-by: Jake Lambert <jake.lambert@volusion.com >
(cherry picked from commit 4ed484bac4 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:24 +02:00
Thomas Riccardi and Sebastiaan van Stijn
2e7e529a18
Fix login documentation layout
...
ddadd3db49 mass standardized the
formatting, with some errors.
This commit fixes errors on `login.md`:
- revert wrong `Logging out` headline
- restore correct level for some headlines (relative to parent
headline level change)
- re-add `Usage` headlines, with better name
Also add `related commands` headline on `login` and `logout`.
Signed-off-by: Thomas Riccardi <thomas@deepomatic.com >
(cherry picked from commit a0e3ec8790 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:22 +02:00
Alex Mayer and Sebastiaan van Stijn
f8f230181e
Docs: Add Spaces Around Parenthesis Where Needed
...
Signed-off-by: Alex Mayer <amayer5125@gmail.com >
(cherry picked from commit 2b0fdd0f17 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:19 +02:00
Lihua Tang and Sebastiaan van Stijn
0ee4693953
Typo fix
...
Signed-off-by: Lihua Tang <lhtang@alauda.io >
(cherry picked from commit ca5e453180 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:17 +02:00
Rui Cao and Sebastiaan van Stijn
cb4cd04c64
Typo fix: filesytem -> filesystem
...
Signed-off-by: Rui Cao <ruicao@alauda.io >
(cherry picked from commit 2eb95909ee )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:15 +02:00
Anda Xu and Sebastiaan van Stijn
d2e771fed6
update docs with current supported features options
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
(cherry picked from commit d656706678 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-25 15:30:09 +02:00
Vincent Demeester and GitHub
b8911a3b33
Merge pull request #1481 from thaJeztah/18.09_backport_fix_docker_invalid_subcommand
...
[18.09 backport] Fix `docker invalid-subcommand` regression
2018-10-25 09:35:28 +02:00
Akihiro Suda and Sebastiaan van Stijn
ebe071a9b3
Fix docker invalid-subcommand regression
...
Starting with a3fe7d62b8 ,
`docker invalid-subcommand` did not exit with non-zero status.
Fix #1428
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
(cherry picked from commit d708cada43 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2018-10-24 20:49:10 +02:00
Andrew Hsu and GitHub
ecb972ab38
Merge pull request #1475 from tiborvass/18.09-fix-build-stream
...
[18.09] build: update session support detection
v18.09.0-beta5
2018-10-22 19:24:24 -07:00
Tibor Vass
4c68a9666f
build: update session support detection
...
Avoid testing for session support in non-buildkit builder to support
servers that falsely report as `1.39` compatible
Signed-off-by: Tibor Vass <tibor@docker.com >
(cherry picked from commit 3e8c41beb0 )
Signed-off-by: Tibor Vass <tibor@docker.com >
2018-10-22 23:02:08 +00:00