From c53a05b8c190e9924be8ffd2f79aa58d1fd90ee0 Mon Sep 17 00:00:00 2001 From: Jem Bishop <40360024+jembishop@users.noreply.github.com> Date: Thu, 1 Jul 2021 17:11:09 +0100 Subject: [PATCH 1/3] Workaround for outdated slirp4netns on debian (#13029) * Workaround for outdated slirp4netns on debian I had issue on debian 11 where the package on the main apt repositories was too old. This provides workaround, by adding the testing repos to sources list then upgrading slirp4netns * pr review - add console tag - add newline before console code block - remove the installation instructions to `slirp4netns` and link to the releases page, which will have it anyway. * pr review - add in suggested comment about vpnkit --- engine/security/rootless.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/engine/security/rootless.md b/engine/security/rootless.md index 05cc53d8fd..735945b52b 100644 --- a/engine/security/rootless.md +++ b/engine/security/rootless.md @@ -76,6 +76,15 @@ testuser:231072:65536 `sudo modprobe overlay permit_mounts_in_userns=1` ([Debian-specific kernel patch, introduced in Debian 10](https://salsa.debian.org/kernel-team/linux/blob/283390e7feb21b47779b48e0c8eb0cc409d2c815/debian/patches/debian/overlayfs-permit-mounts-in-userns.patch)). Add the configuration to `/etc/modprobe.d` for persistence. + +- Rootless docker requires version of `slirp4netns` greater than `v0.4.0` (when `vpnkit` is not installed). + Check you have this with + + ```console + $ slirp4netns --version + ``` + If you do not have this download and install the latest [release](https://github.com/rootless-containers/slirp4netns/releases). +
- Installing `fuse-overlayfs` is recommended. Run `sudo pacman -S fuse-overlayfs`. From a2e508e3a662bfcc4d0635a75a4e371c727a876a Mon Sep 17 00:00:00 2001 From: Stephen Turner Date: Fri, 2 Jul 2021 14:06:23 +0100 Subject: [PATCH 2/3] Update install.md Previous patch missed a parallel update at another place in the page. --- docker-for-windows/install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md index 8702b05908..a82ef8cc05 100644 --- a/docker-for-windows/install.md +++ b/docker-for-windows/install.md @@ -31,7 +31,7 @@ Your Windows machine must meet the following requirements to successfully instal ### WSL 2 backend -- Windows 10 64-bit: Home, Pro, Enterprise, or Education, version 1903 (Build 18362 or higher). +- Windows 10 64-bit: Home or Pro 2004 (build 19041) or higher, or Enterprise or Education 1909 (build 18363) or higher. - Enable the WSL 2 feature on Windows. For detailed instructions, refer to the [Microsoft documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10){: target="_blank" rel="noopener" class="_"}. - The following hardware prerequisites are required to successfully run @@ -49,7 +49,7 @@ WSL 2 on Windows 10: ### Hyper-V backend and Windows containers -- Windows 10 64-bit: Pro (Build 19041 or higher), or Enterprise or Education (Build 18363 or higher). +- Windows 10 64-bit: Pro 2004 (build 19041) or higher, or Enterprise or Education 1909 (build 18363) or higher. For Windows 10 Home, see [System requirements for WSL 2 backend](#system-requirements-for-wsl-2-backend). - Hyper-V and Containers Windows features must be enabled. From 590463d6ce75c5ad02358998efee34a9fd358f6b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 2 Jul 2021 16:49:11 +0200 Subject: [PATCH 3/3] update engine reference docs updating to the latest changes from the 20.10 branch Signed-off-by: Sebastiaan van Stijn --- _data/engine-cli/docker_context_create.yaml | 6 +++--- _data/engine-cli/docker_context_export.yaml | 4 ++-- _data/engine-cli/docker_context_update.yaml | 6 +++--- _data/engine-cli/docker_network_create.yaml | 2 +- _data/engine-cli/docker_pull.yaml | 2 +- _data/engine-cli/docker_run.yaml | 2 +- _data/engine-cli/docker_stack.yaml | 4 ++-- _data/engine-cli/docker_stack_deploy.yaml | 6 +++--- _data/engine-cli/docker_stack_ls.yaml | 8 ++++---- _data/engine-cli/docker_stack_ps.yaml | 6 +++--- _data/engine-cli/docker_stack_rm.yaml | 6 +++--- _data/engine-cli/docker_stack_services.yaml | 6 +++--- _data/engine-cli/docker_version.yaml | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/_data/engine-cli/docker_context_create.yaml b/_data/engine-cli/docker_context_create.yaml index a3102090c6..0a3a5b731a 100644 --- a/_data/engine-cli/docker_context_create.yaml +++ b/_data/engine-cli/docker_context_create.yaml @@ -11,7 +11,7 @@ options: value_type: string description: | Default orchestrator for stack operations to use with this context (swarm|kubernetes|all) - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: false @@ -45,10 +45,10 @@ options: value_type: stringToString default_value: '[]' description: set the kubernetes endpoint - deprecated: false + deprecated: true experimental: false experimentalcli: false - kubernetes: false + kubernetes: true swarm: false examples: |- ### Create a context with a docker and kubernetes endpoint diff --git a/_data/engine-cli/docker_context_export.yaml b/_data/engine-cli/docker_context_export.yaml index 021fb0bd56..551815559a 100644 --- a/_data/engine-cli/docker_context_export.yaml +++ b/_data/engine-cli/docker_context_export.yaml @@ -13,10 +13,10 @@ options: value_type: bool default_value: "false" description: Export as a kubeconfig file - deprecated: false + deprecated: true experimental: false experimentalcli: false - kubernetes: false + kubernetes: true swarm: false deprecated: false experimental: false diff --git a/_data/engine-cli/docker_context_update.yaml b/_data/engine-cli/docker_context_update.yaml index d5980a68df..29b92a10bd 100644 --- a/_data/engine-cli/docker_context_update.yaml +++ b/_data/engine-cli/docker_context_update.yaml @@ -11,7 +11,7 @@ options: value_type: string description: | Default orchestrator for stack operations to use with this context (swarm|kubernetes|all) - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: false @@ -37,10 +37,10 @@ options: value_type: stringToString default_value: '[]' description: set the kubernetes endpoint - deprecated: false + deprecated: true experimental: false experimentalcli: false - kubernetes: false + kubernetes: true swarm: false examples: |- ### Update an existing context diff --git a/_data/engine-cli/docker_network_create.yaml b/_data/engine-cli/docker_network_create.yaml index 6f24e23d73..2bdf4522eb 100644 --- a/_data/engine-cli/docker_network_create.yaml +++ b/_data/engine-cli/docker_network_create.yaml @@ -291,7 +291,7 @@ examples: |- | `com.docker.network.bridge.enable_icc` | `--icc` | Enable or Disable Inter Container Connectivity | | `com.docker.network.bridge.host_binding_ipv4` | `--ip` | Default IP when binding container ports | | `com.docker.network.driver.mtu` | `--mtu` | Set the containers network MTU | - | `com.docker.network.container_interface_prefix` | - | Set a custom prefix for container interfaces | + | `com.docker.network.container_iface_prefix` | - | Set a custom prefix for container interfaces | The following arguments can be passed to `docker network create` for any network driver, again with their approximate equivalents to `docker daemon`. diff --git a/_data/engine-cli/docker_pull.yaml b/_data/engine-cli/docker_pull.yaml index 57ca72ec17..83ddef1c19 100644 --- a/_data/engine-cli/docker_pull.yaml +++ b/_data/engine-cli/docker_pull.yaml @@ -181,7 +181,7 @@ examples: |- ```dockerfile FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2 - LABEL maintainer="some maintainer " + LABEL org.opencontainers.image.authors="some maintainer " ``` > **Note** diff --git a/_data/engine-cli/docker_run.yaml b/_data/engine-cli/docker_run.yaml index 6f9e5879b3..1d2b5986c8 100644 --- a/_data/engine-cli/docker_run.yaml +++ b/_data/engine-cli/docker_run.yaml @@ -1236,7 +1236,7 @@ examples: |- If you want to add a running container to a network use the `docker network connect` subcommand. You can connect multiple containers to the same network. Once connected, the - containers can communicate easily need only another container's IP address + containers can communicate easily using only another container's IP address or name. For `overlay` networks or custom plugins that support multi-host connectivity, containers connected to the same multi-host network but launched from different Engines can also communicate in this way. diff --git a/_data/engine-cli/docker_stack.yaml b/_data/engine-cli/docker_stack.yaml index 3c378f8ac1..dee0895bfa 100644 --- a/_data/engine-cli/docker_stack.yaml +++ b/_data/engine-cli/docker_stack.yaml @@ -20,7 +20,7 @@ options: - option: kubeconfig value_type: string description: Kubernetes config file - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -28,7 +28,7 @@ options: - option: orchestrator value_type: string description: Orchestrator to use (swarm|kubernetes|all) - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: false diff --git a/_data/engine-cli/docker_stack_deploy.yaml b/_data/engine-cli/docker_stack_deploy.yaml index a42d84d32d..7db53bb5fe 100644 --- a/_data/engine-cli/docker_stack_deploy.yaml +++ b/_data/engine-cli/docker_stack_deploy.yaml @@ -28,7 +28,7 @@ options: - option: namespace value_type: string description: Kubernetes namespace to use - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -67,7 +67,7 @@ inherited_options: - option: kubeconfig value_type: string description: Kubernetes config file - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -75,7 +75,7 @@ inherited_options: - option: orchestrator value_type: string description: Orchestrator to use (swarm|kubernetes|all) - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: false diff --git a/_data/engine-cli/docker_stack_ls.yaml b/_data/engine-cli/docker_stack_ls.yaml index ea3c9db58e..50d22c23ba 100644 --- a/_data/engine-cli/docker_stack_ls.yaml +++ b/_data/engine-cli/docker_stack_ls.yaml @@ -18,7 +18,7 @@ options: value_type: bool default_value: "false" description: List stacks from all Kubernetes namespaces - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -35,7 +35,7 @@ options: value_type: stringSlice default_value: '[]' description: Kubernetes namespaces to use - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -44,7 +44,7 @@ inherited_options: - option: kubeconfig value_type: string description: Kubernetes config file - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -52,7 +52,7 @@ inherited_options: - option: orchestrator value_type: string description: Orchestrator to use (swarm|kubernetes|all) - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: false diff --git a/_data/engine-cli/docker_stack_ps.yaml b/_data/engine-cli/docker_stack_ps.yaml index 4176ec0529..c04a79fd5a 100644 --- a/_data/engine-cli/docker_stack_ps.yaml +++ b/_data/engine-cli/docker_stack_ps.yaml @@ -33,7 +33,7 @@ options: - option: namespace value_type: string description: Kubernetes namespace to use - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -70,7 +70,7 @@ inherited_options: - option: kubeconfig value_type: string description: Kubernetes config file - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -78,7 +78,7 @@ inherited_options: - option: orchestrator value_type: string description: Orchestrator to use (swarm|kubernetes|all) - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: false diff --git a/_data/engine-cli/docker_stack_rm.yaml b/_data/engine-cli/docker_stack_rm.yaml index ec951fe7d1..5355ea86df 100644 --- a/_data/engine-cli/docker_stack_rm.yaml +++ b/_data/engine-cli/docker_stack_rm.yaml @@ -17,7 +17,7 @@ options: - option: namespace value_type: string description: Kubernetes namespace to use - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -26,7 +26,7 @@ inherited_options: - option: kubeconfig value_type: string description: Kubernetes config file - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -34,7 +34,7 @@ inherited_options: - option: orchestrator value_type: string description: Orchestrator to use (swarm|kubernetes|all) - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: false diff --git a/_data/engine-cli/docker_stack_services.yaml b/_data/engine-cli/docker_stack_services.yaml index 083da92e5e..c34f83e946 100644 --- a/_data/engine-cli/docker_stack_services.yaml +++ b/_data/engine-cli/docker_stack_services.yaml @@ -33,7 +33,7 @@ options: - option: namespace value_type: string description: Kubernetes namespace to use - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -52,7 +52,7 @@ inherited_options: - option: kubeconfig value_type: string description: Kubernetes config file - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true @@ -60,7 +60,7 @@ inherited_options: - option: orchestrator value_type: string description: Orchestrator to use (swarm|kubernetes|all) - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: false diff --git a/_data/engine-cli/docker_version.yaml b/_data/engine-cli/docker_version.yaml index 90e72519fa..2273408499 100644 --- a/_data/engine-cli/docker_version.yaml +++ b/_data/engine-cli/docker_version.yaml @@ -22,7 +22,7 @@ options: - option: kubeconfig value_type: string description: Kubernetes config file - deprecated: false + deprecated: true experimental: false experimentalcli: false kubernetes: true