Sebastiaan van Stijn
9ee3d08aeb
vendor: github.com/containerd/console v1.0.2
...
full diff: https://github.com/containerd/console/compare/v1.0.1...v1.0.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:45 +02:00
Sebastiaan van Stijn
945f1237ec
vendor: github.com/containerd/cgroups v1.0.1
...
full diff: 0b889c03f1
...v1.0.1
relevant changes:
- go.mod: github.com/gogo/protobuf v1.3.2 and generate protos
update gogo/protobuf and regenerate protos to address CVE-2021-3121
(https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3121 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:42 +02:00
Sebastiaan van Stijn
adb118d296
vendor.conf: sort alphabetically
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:40 +02:00
Sebastiaan van Stijn
6d25af0cd7
vendor: golang.org/x/time 3af7569d3a1e776fc2a3c1cec133b43105ea9c2e
...
full diff: 555d28b269...3af7569d3a
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:38 +02:00
Sebastiaan van Stijn
8ebe404dfc
vendor: golang.org/x/sys d19ff857e887eacb631721f188c7d365c2331456
...
full diff: 134d130e1a...d19ff857e8
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:34 +02:00
Sebastiaan van Stijn
af1687406b
vendor: golang.org/x/sync 036812b2e83c0ddf193dd5a34e034151da389d09
...
full diff: cd5d95a43a...036812b2e8
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:32 +02:00
Sebastiaan van Stijn
dea9976143
vendor: golang.org/x/net e18ecbb051101a46fc263334b127c89bc7bff7ea
...
full diff: ab34263943...e18ecbb051
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:30 +02:00
Sebastiaan van Stijn
716291337b
vendor: golang.org/x/crypto 0c34fe9e7dc2486962ef9867e3edb3503537209f
...
full diff: c1f2f97bff...0c34fe9e7d
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:28 +02:00
Sebastiaan van Stijn
2cbb88f4c9
vendor: github.com/modern-go/reflect2 v1.0.1
...
Previous vendor was using the 1.0.1 tag (without v-prefix).
diff: https://github.com/modern-go/reflect2/compare/1.0.1...v1.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:27 +02:00
Sebastiaan van Stijn
d6c55a105f
vendor: github.com/moby/sys mountinfo/v0.4.1
...
full diff: 1bc8673b57...b0f1fd7235
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:29:22 +02:00
Sebastiaan van Stijn
f445637470
vendor: github.com/gogo/protobuf v1.3.2
...
full diff: https://github.com/gogo/protobuf/compare/v1.3.1...v1.3.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 14:27:51 +02:00
Silvin Lubecki
347cd403c0
Merge pull request #3131 from thaJeztah/bump_term_ansiterm
...
vendor: moby/term, Azure/go-ansiterm for golang.org/x/sys/windows compat
2021-06-21 14:18:14 +02:00
Sebastiaan van Stijn
b5bc279901
vendor: moby/term, Azure/go-ansiterm for golang.org/x/sys/windows compat
...
Changes:
- winterm: GetStdFile(): Added compatibility with "golang.org/x/sys/windows"
- winterm: fix GetStdFile() falltrough
- update deprecation message to refer to the correct replacement
- add go.mod
- Fix int overflow
- Convert int to string using rune()
full diff:
- bea5bbe245...3f7ff695ad
- d6e3b3328b...d185dfc1b5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-21 13:30:47 +02:00
Silvin Lubecki
674c074dc4
Merge pull request #3013 from thaJeztah/bump_cobra
...
vendor: github.com/spf13/cobra v1.1.3
2021-06-17 22:33:19 +02:00
Govind Rai
e12aade595
Update WORKDIR command information
...
Signed-off-by: Govind Rai <raigovind93@gmail.com>
2021-06-16 16:47:28 -07:00
Sebastiaan van Stijn
524e3b215d
e2e: update docker-compose to 1.29.2
...
Newer versions have COMPOSE_DOCKER_CLI_BUILD enabled by default,
so removing that env-var.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-16 11:37:41 +02:00
Silvin Lubecki
e3ade90f5b
Merge pull request #3137 from thaJeztah/update_ci_engine
...
CI: update engine versions and Jenkins labels
2021-06-15 15:28:04 +02:00
Sebastiaan van Stijn
c6cd0493ab
circleCI: update docker engine to 20.10.6
...
20.10.6 looks to be the latest supported version:
https://circleci.com/docs/2.0/building-docker-images/#docker-version
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-15 13:34:30 +02:00
Sebastiaan van Stijn
661b87ac9b
Jenkinsfile: update old engine version to 19.03
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-15 13:34:28 +02:00
Sebastiaan van Stijn
2849437f21
Jenkinsfile: update labels to prevent running on cgroups v2
...
The dind engine version that we use in e2e does not support cgroups v2,
so if we landed on an Ubuntu 20.04 node with cgroups v2 enabled, CI failed:
Stderr: Error response from daemon: cgroups: cgroup mountpoint does not exist: unknown
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-15 13:32:03 +02:00
Silvin Lubecki
fa63ea7955
Merge pull request #3134 from thaJeztah/preserve_os_env
...
e2e: make sure that os.environ is preserved
2021-06-14 11:11:04 +02:00
Sebastiaan van Stijn
f3b6ed744f
e2e: make sure that os.environ is preserved
...
We updated some of these functions to make sure os.environ was
preserved, but some where not.
This adds a utility to help with this, which also prevents the
os.environ to be added multiple times.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-11 17:46:30 +02:00
Sebastiaan van Stijn
2ebf5d92aa
Merge pull request #3124 from thaJeztah/update_cred_helpers
...
vendor: github.com/docker/docker-credential-helpers v0.6.4
2021-06-07 19:49:58 +02:00
Sebastiaan van Stijn
7672267e16
vendor: github.com/docker/docker-credential-helpers v0.6.4
...
full diff: 38bea2ce27
...v0.6.4
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-07 18:12:01 +02:00
Sebastiaan van Stijn
eb898d59c7
Merge pull request #3122 from thaJeztah/bump_docker_20.10.7
...
vendor: github.com/docker/docker v20.10.7
2021-06-07 11:02:52 +02:00
Sebastiaan van Stijn
49f6071532
vendor: github.com/docker/docker v20.10.7
...
full diff: d5209b29b9
...v20.10.7
skipping the buildkit update for now, as it didn't bring changes
in vendored files.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-06-05 17:46:36 +02:00
Sebastiaan van Stijn
117d156ce8
Merge pull request #3120 from tedhexaflow/fix-word-docker-run-network
...
Fix minor wording
2021-06-04 13:05:24 +02:00
Metal
3b502ca00e
Fix minor wording
...
Signed-off-by: Metal <2466052+tedhexaflow@users.noreply.github.com>
2021-06-04 17:26:28 +07:00
Silvin Lubecki
1c174ced5e
Merge pull request #2975 from thaJeztah/attach_refactor
...
Slight cleanup/refactor of attachContainer
2021-05-31 16:27:56 +02:00
Sebastiaan van Stijn
16131fb459
Slight cleanup/refactor of attachContainer
...
Return early in case there's an error, and declare variables closer
to where they're used.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-31 15:33:31 +02:00
Sebastiaan van Stijn
c7adb47076
Merge pull request #2984 from pn11/pn11-patch-1
...
docs: Fix wrong bridge driver option
2021-05-31 15:26:53 +02:00
Silvin Lubecki
74a6e2cf62
Merge pull request #3110 from thaJeztah/fix_reference_link
...
docs: fix link to command-line reference
2021-05-31 10:06:59 +02:00
Sebastiaan van Stijn
04e6884f65
docs: fix link to command-line reference
...
This link worked on GitHub, but was broken on docs.docker.com, so
replacing with a regular link directly to the docs instead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-26 14:14:02 +02:00
Sebastiaan van Stijn
1142740996
Merge pull request #2972 from thaJeztah/ipv6_port_join
...
Use net.JoinHostPort() to fix formatting with IPv6 addresses
2021-05-25 14:58:47 +02:00
Sebastiaan van Stijn
6b4d2e83cd
Merge pull request #3103 from djs55/ignore_sigurg_darwin
...
Ignore SIGURG on Unix (including Darwin)
2021-05-25 12:29:14 +02:00
Silvin Lubecki
e26409ebf1
Merge pull request #2986 from thaJeztah/ignore_nil_signals
...
ForwardAllSignals: check if channel is closed, and remove warning
2021-05-25 10:29:42 +02:00
David Scott
cedaf44ea2
Ignore SIGURG on Darwin too
...
This extends #2929 to Darwin as well as Linux.
Running the example in https://github.com/golang/go/issues/37942
I see lots of:
```
dave@m1 sigurg % uname -ms
Darwin arm64
dave@m1 sigurg % go run main.go
received urgent I/O condition: 2021-05-21 16:03:03.482211 +0100 BST m=+0.014553751
received urgent I/O condition: 2021-05-21 16:03:03.507171 +0100 BST m=+0.039514459
```
Signed-off-by: David Scott <dave@recoil.org>
2021-05-24 19:37:53 +01:00
Silvin Lubecki
86e1f04b5f
Merge pull request #3092 from thaJeztah/fix_plugin_link
...
docs: dockerd: fix broken link and markdown touch-ups
2021-05-19 14:53:51 +02:00
Silvin Lubecki
4623696725
Merge pull request #3077 from AkihiroSuda/silence-unhandleable-deprecated-warnings
...
printServerWarningsLegacy: silence "No kernel memory limit support"; silence "No oom kill disable support" on cgroup v2
2021-05-18 21:57:59 +02:00
Silvin Lubecki
25952c90ee
Merge pull request #3082 from tianon/oci-authors
...
Swap "LABEL maintainer" for the OCI pre-defined "org.opencontainers.image.authors"
2021-05-18 21:57:42 +02:00
Sebastiaan van Stijn
67dde4ebbd
Merge pull request #3095 from ErikHumphrey/Erik/fix-broken-jump-link
...
docs: Fix broken jump link
2021-05-17 14:19:59 +02:00
Erik Humphrey
57e7680591
docs: Fix broken jump link
...
Signed-off-by: Erik Humphrey <erik.humphrey@carleton.ca>
2021-05-13 10:10:38 -04:00
Sebastiaan van Stijn
f3034ee928
docs: dockerd: fix broken link and markdown touch-ups
...
Jekyll doesn't work well with markdown links that are wrapped, so changing
the link to be on a single line.
While at it, also added/changed some code-hints.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-12 09:31:50 +02:00
Sebastiaan van Stijn
19c5aab404
Merge pull request #2990 from cpuguy83/fix_start_blocking
...
Fix `docker start` blocking on signal handling
2021-05-07 08:32:48 +02:00
Tianon Gravi
782192a6e5
Swap "LABEL maintainer" for the OCI pre-defined "org.opencontainers.image.authors"
...
https://github.com/opencontainers/image-spec/blob/v1.0.1/annotations.md#pre-defined-annotation-keys
Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
2021-05-04 09:48:13 -07:00
Silvin Lubecki
cde06fbf1d
Merge pull request #3052 from thaJeztah/dual_logging_cache_options
...
docs: document log-opts for "dual logging" cache
2021-05-04 15:44:05 +02:00
Akihiro Suda
05ec0188fa
printServerWarningsLegacy: silence "No oom kill disable support" on cgroup v2
...
The warning should be ignored on cgroup v2 hosts.
Relevant: 8086443a44
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-05-04 19:35:07 +09:00
Akihiro Suda
731f52cfe8
printServerWarningsLegacy: silence "No kernel memory limit support"
...
The kernel memory limit is deprecated in Docker 20.10.0,
and its support was removed in runc v1.0.0-rc94.
So, this warning can be safely removed.
Relevant: b8ca7de823
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-05-04 19:17:11 +09:00
Silvin Lubecki
9c18c7deda
Merge pull request #3072 from thaJeztah/update_proxy_examples
...
docs: various changes, and touch-up main CLI page
2021-05-04 11:27:36 +02:00
Sebastiaan van Stijn
3c8d65963d
docs: cleanup / refactor cli doc
...
More improvements can be made, but this makes a start on cleaning up
this page:
- Reorganise configuration file options into sections
- Use tables for related options to make them easier to find
- Add warning about the config file's possibility to contain sensitive information
- Some MarkDown touch-ups (use "console" code-hint to assist copy/paste)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-01 11:41:55 +02:00