GordonTheTurtle
44a430f4c4
Merge component 'engine' from git@github.com:moby/moby master
2021-12-10 01:34:52 +00:00
Tianon Gravi
04dd8f194b
Merge pull request #42981 from frobnicaty/patch-1
...
Fix grammar for "does not exist"
Upstream-commit: 8955d8da8951695a98eb7e15bead19d402c6eb27
Component: engine
2021-12-09 13:36:53 -08:00
GordonTheTurtle
a3b464519e
Merge component 'cli' from git@github.com:docker/cli master
2021-12-09 17:03:09 +00:00
Sebastiaan van Stijn
2f96e953f6
Merge pull request #3384 from crazy-max/ci-glibc
...
ci: add glibc to build matrix
Upstream-commit: 6fbf81690162a085574f20243ef3900dd9b4e8c0
Component: cli
2021-12-09 16:58:50 +01:00
CrazyMax
50046192d5
ci: add glibc to build matrix
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Upstream-commit: 3425e9dc3c054bd62489c3ca03feafd16e573c67
Component: cli
2021-12-09 16:37:12 +01:00
GordonTheTurtle
2487c217e4
Merge component 'cli' from git@github.com:docker/cli master
2021-12-09 13:03:02 +00:00
Sebastiaan van Stijn
b13f20cf63
Merge pull request #3372 from knocte/patch-1
...
docker exec cli docs: show 2 env vars, not just 1
Upstream-commit: 548fd200875b1dc41500f86f0a822c04ca8c268a
Component: cli
2021-12-09 12:28:07 +01:00
GordonTheTurtle
9f31dd30eb
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2021-12-09 09:34:29 +00:00
Sebastiaan van Stijn
a1173acac6
Merge pull request #602 from crazy-max/update-buildx-0.7.1
...
update buildx to v0.7.1
Upstream-commit: 676373e0d82a43b948557172b80b0cce408e1371
Component: packaging
2021-12-09 10:21:52 +01:00
Sebastiaan van Stijn
24e50987bc
Merge pull request #603 from glours/update-docker-scan
...
update Docker Scan version to 0.10.0
Upstream-commit: 64959366c5979242b7b00160f0ca2fbf3f89d19d
Component: packaging
2021-12-09 10:04:34 +01:00
Andres G. Aragoneses
0e10b32ad8
docker exec cli docs: show 2 env vars, not just 1
...
This way it's more clear for the reader that the flag can be used
more than once.
Signed-off-by: Andres G. Aragoneses <knocte@gmail.com>
Upstream-commit: 418dbc4e77b31bffa0d1b7f9848539573fcb2438
Component: cli
2021-12-09 07:27:12 +08:00
GordonTheTurtle
6ed4e6f2c5
Merge component 'engine' from git@github.com:moby/moby master
2021-12-08 21:34:14 +00:00
GordonTheTurtle
260194089e
Merge component 'cli' from git@github.com:docker/cli master
2021-12-08 21:03:03 +00:00
Sebastiaan van Stijn
9074c5310c
Merge pull request #3360 from jlecordier/patch-1
...
fix missing closing parenthese
Upstream-commit: e156f9b76639e0577f95f9ec12eb6d4e040d984e
Component: cli
2021-12-08 19:55:29 +01:00
Brian Goff
d698998134
Merge pull request #43062 from AkihiroSuda/runc-1.0.3
...
Bump up runc v1.0.3
Upstream-commit: d456264580cf21de8f22d678afd0cf5decfea36a
Component: engine
2021-12-08 10:09:46 -08:00
Guillaume Lours
76ad6519be
update Docker Scan version to 0.10.0
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
Upstream-commit: 3e8c7f7b2995a85cec9a4bbce444c557fe987854
Component: packaging
2021-12-08 18:57:05 +01:00
jlecordier
61d143f329
added missing closing parenthese
...
Signed-off-by: jlecordier <jeanlecordier@hotmail.fr>
Upstream-commit: a185143707f4f159bc96709ad8a718450b9f7c8b
Component: cli
2021-12-08 18:02:45 +01:00
GordonTheTurtle
e83edc7564
Merge component 'cli' from git@github.com:docker/cli master
2021-12-08 13:02:54 +00:00
Sebastiaan van Stijn
77a6f3d21b
Merge pull request #3105 from larstomas/patch-1
...
Change IO order in description
Upstream-commit: a34e921be75080b0baf7595993ea1fcc8b740047
Component: cli
2021-12-08 13:08:50 +01:00
Sebastiaan van Stijn
f853d02a33
Merge pull request #2976 from JonZeolla/fix-docker-run-env-docs
...
Fix mistake with env var example in docker run docs
Upstream-commit: d18275a90ce09a287a284f66b05be0943dd3c397
Component: cli
2021-12-08 12:04:51 +01:00
Tomas Bäckman
eab9b4637a
Change IO order in description
...
Change the order of received/written and sent/read in NET I/O and BLOCK I/O description reflect the order in I/O (Input/Output).
From example above:
CONTAINER NAME: awesome_brattain
BLOCK I/O: 147kB / 0B
awesome_brattain has written 147kB and read 0B
Signed-off-by: Tomas Bäckman <larstomas@gmail.com>
Upstream-commit: c6636d4d658065f2ce72902271de58728debad99
Component: cli
2021-12-08 11:50:08 +01:00
Sebastiaan van Stijn
2be7ddbde0
Merge pull request #3142 from govindrai/patch-1
...
Add information on WORKDIR
Upstream-commit: 5e0f1b9dccdea990a97c21ccbb202266e004f069
Component: cli
2021-12-08 11:41:54 +01:00
Sebastiaan van Stijn
ab01d33915
Merge pull request #3164 from tnir/dockerfile-syntax
...
Fix the (dead) link for docs for Dockerfile syntax reference
Upstream-commit: 6067738955a60b307258a4bc2f5ac77eeb460424
Component: cli
2021-12-08 11:38:29 +01:00
Silvin Lubecki
64d67bf2c8
Merge pull request #3256 from thaJeztah/cleanup_rootcommand
...
cli.SetupRootCommand(): minor cleanup
Upstream-commit: ed86571bfa0ed7f33421193fa967749fd09eb660
Component: cli
2021-12-08 11:31:59 +01:00
Sebastiaan van Stijn
08e21394c6
Merge pull request #3276 from brdbkr/master
...
Fixing typo (his --> its)
Upstream-commit: a0720cb07186f9d28917435117bd09063094051e
Component: cli
2021-12-08 11:14:38 +01:00
Sebastiaan van Stijn
c93a0edf9a
Merge pull request #3282 from Gsealy/table-format
...
format create.md table
Upstream-commit: 469fe5733ecfd21a1328485fb91dc926656936db
Component: cli
2021-12-08 11:13:33 +01:00
Sebastiaan van Stijn
fc55decb30
Merge pull request #3382 from mikedalton/docs-typo-fix
...
Update Ubuntu version number references in push.md
Upstream-commit: aa280d2879fb054a1cd76a84e8973f2c522a0805
Component: cli
2021-12-08 11:08:06 +01:00
Mike Dalton
c911f617dc
Update Ubuntu version number references in push.md
...
Ubuntu version references were a mixture of 14.04 (in descriptions) and 20.04 (in example code). Updated description references to 20.04 to match example code.
Signed-off-by: Mike Dalton <mikedalton@github.com>
Upstream-commit: 6ad2ceba3c9732e7e039f182f1761951bc7f837a
Component: cli
2021-12-08 17:09:10 +09:00
GordonTheTurtle
824fecd85e
Merge component 'engine' from git@github.com:moby/moby master
2021-12-08 05:33:46 +00:00
Tianon Gravi
b14fa5a35e
Merge pull request #43064 from thaJeztah/bump_go_1.17.4
...
Update Go to 1.17.4
Upstream-commit: 87521affb077c5a041c2c1ef7f081979e3df4d50
Component: engine
2021-12-07 17:17:58 -08:00
GordonTheTurtle
be9d0088a1
Merge component 'cli' from git@github.com:docker/cli master
2021-12-08 01:02:49 +00:00
Sebastiaan van Stijn
af04cb6a2a
Merge pull request #3365 from crazy-max/gha-test
...
ci: github actions test workflow
Upstream-commit: 4db5a4f82d1ac4fe503630a6cc62a5accc4f016f
Component: cli
2021-12-07 15:41:54 +01:00
CrazyMax
09aa8f5bba
ci: github actions test workflow
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Upstream-commit: 4d93717ae5615a7a8960b833a30fea2077805148
Component: cli
2021-12-07 14:50:22 +01:00
Silvin Lubecki
9ef6164a1d
Merge pull request #3379 from thaJeztah/bump_go_1.16.11
...
Update Go to 1.16.11
Upstream-commit: ba0ace05b64e9f574b145a2a0e3b4707aabc5816
Component: cli
2021-12-07 14:30:36 +01:00
Sebastiaan van Stijn
979b956a00
Update Go to 1.16.11
...
go1.16.11 (released 2021-12-02) includes fixes to the compiler, runtime, and the
net/http, net/http/httptest, and time packages. See the Go 1.16.11 milestone on
the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.16.11+label%3ACherryPickApproved
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dedd4b79ca4165573757e53aa036233508c5f478
Component: cli
2021-12-06 10:57:30 +01:00
Sebastiaan van Stijn
8f4036003e
Update Go to 1.17.4
...
go1.17.4 (released 2021-12-02) includes fixes to the compiler, linker, runtime,
and the go/types, net/http, and time packages. See the Go 1.17.4 milestone on
the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.17.4+label%3ACherryPickApproved
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6bb3891c602a0044a458b5dc6b535636bbe40ff2
Component: engine
2021-12-06 10:13:39 +01:00
Akihiro Suda
0585e0a162
vendor: github.com/opencontainers/runc v1.0.3
...
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Upstream-commit: 934f955e3d6253152781d33d3fdfd856182ad5d0
Component: engine
2021-12-06 15:11:57 +09:00
Akihiro Suda
4430d3fc17
update runc binary to v1.0.3
...
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Upstream-commit: 53397ac5391c49ebd534d06cc57b6a2a12a739d3
Component: engine
2021-12-06 15:10:27 +09:00
frobnicaty
9a831d679c
Fix grammar for "does not exist"
...
as opposed to "does not exists"
Signed-off-by: frobnicaty <92033765+frobnicaty@users.noreply.github.com>
Upstream-commit: d78b8835766221e52842a78402c2b78ac23af530
Component: engine
2021-12-03 15:50:13 +00:00
GordonTheTurtle
bb2d2a7d24
Merge component 'engine' from git@github.com:moby/moby master
2021-12-02 21:33:39 +00:00
Sebastiaan van Stijn
901b2a1d4f
Merge pull request #42979 from akerouanton/bump-fluent-logger
...
vendor: github.com/fluent/fluent-logger-golang v1.8.0
Upstream-commit: f6848ae321b69efb0c1a0304a394e1e3f141b1e1
Component: engine
2021-12-02 20:51:04 +01:00
Tianon Gravi
8fa0635338
Merge pull request #43036 from thaJeztah/bump_hcsshim
...
vendor: github.com/Microsoft/hcsshim v0.8.23
Upstream-commit: 0f92cf20442799364539cd1a121339a0395b2b31
Component: engine
2021-12-02 11:49:03 -08:00
Sebastiaan van Stijn
46a0a9b1c2
Merge pull request #42838 from sanjams2/42731-development
...
Add an option to specify log format for awslogs driver
Upstream-commit: 787b8fe14f34f04f723bd0913f293a59be428fe6
Component: engine
2021-12-02 20:48:06 +01:00
Brian Goff
1a76767a8f
Merge pull request #43035 from thaJeztah/bump_ttrpc
...
vendor: github.com/containerd/ttrpc v1.1.0
Upstream-commit: b46ab1f57997feed98aa2cccd8e4f5a612b963bc
Component: engine
2021-12-02 11:34:11 -08:00
GordonTheTurtle
30893e979c
Merge component 'engine' from git@github.com:moby/moby master
2021-12-02 05:34:25 +00:00
Tianon Gravi
8833587756
Merge pull request #42574 from charlesxsh/fix-deadlock-1
...
fix potential goroutine leak by making channel non-blocking
Upstream-commit: cf811b1122eff139cac31d1febf21750902128bd
Component: engine
2021-12-01 17:35:30 -08:00
Albin Kerouanton
e4c2690d7b
fluentd: Turn ForceStopAsyncSend true when async connect is used
...
The flag ForceStopAsyncSend was added to fluent logger lib in v1.5.0 (at
this time named AsyncStop) to tell fluentd to abort sending logs
asynchronously as soon as possible, when its Close() method is called.
However this flag was broken because of the way the lib was handling it
(basically, the lib could be stucked in retry-connect loop without
checking this flag).
Since fluent logger lib v1.7.0, calling Close() (when ForceStopAsyncSend
is true) will really stop all ongoing send/connect procedure,
wherever it's stucked.
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Upstream-commit: bd61629b6b009b5fa50e31c180e86cede86ce9de
Component: engine
2021-12-02 01:15:28 +01:00
Albin Kerouanton
78d8de7b98
vendor: github.com/fluent/fluent-logger-golang v1.8.0
...
Updates the fluent logger library to v1.8.0. Following PRs/commits were
merged since last bump:
* [Add callback for error handling when using
async](https://github.com/fluent/fluent-logger-golang/pull/97 )
* [Fix panic when accessing unexported struct
field](https://github.com/fluent/fluent-logger-golang/pull/99 )
* [Properly stop logger during (re)connect
failure](https://github.com/fluent/fluent-logger-golang/pull/82 )
* [Support a TLS-enabled connection](e5d6aa13b7
)
See https://github.com/fluent/fluent-logger-golang/compare/v1.6.1..v1.8.0
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
Upstream-commit: e24d61b7efac787ff3d5176d994608937a057522
Component: engine
2021-12-02 01:11:33 +01:00
GordonTheTurtle
ce0386b887
Merge component 'engine' from git@github.com:moby/moby master
2021-12-01 21:34:12 +00:00
Sebastiaan van Stijn
14ea4f5833
Merge pull request #43047 from aaronlehmann/pattern-matcher-parent-results-fix
...
Fix missing parent info case in MatchesUsingParentResults
Upstream-commit: 17b9e4ec92d323e6c3593c9c8718351f1cf02f13
Component: engine
2021-12-01 21:15:19 +01:00