diff --git a/site/content/en/docs/drivers/docker.md b/site/content/en/docs/drivers/docker.md index 4dad78879b96..e00b58c76166 100644 --- a/site/content/en/docs/drivers/docker.md +++ b/site/content/en/docs/drivers/docker.md @@ -9,7 +9,46 @@ aliases: The Docker driver allows you to install Kubernetes into an existing Docker install. On Linux, this does not require virtualization to be enabled. -{{% readfile file="/docs/drivers/includes/docker_usage.inc" %}} +{{% tabs %}} +{{% tab "Standard Docker" %}} +## Requirements + +- [Install Docker](https://hub.docker.com/search?q=&type=edition&offering=community&sort=updated_at&order=desc) 18.09 or higher +- amd64 or arm64 system. +- If using WSL complete [these steps]({{}}) first + +## Usage + +Start a cluster using the docker driver: + +```shell +minikube start --driver=docker +``` +To make docker the default driver: + +```shell +minikube config set driver docker +``` +{{% /tab %}} +{{% tab "Rootless Docker" %}} +## Requirements +- Docker 20.10 or higher, see https://rootlesscontaine.rs/getting-started/docker/ +- Cgroup v2 delegation, see https://rootlesscontaine.rs/getting-started/common/cgroup2/ + +## Usage + +Start a cluster using the rootless docker driver: + +```shell +dockerd-rootless-setuptool.sh install -f +docker context use rootless + +minikube start --driver=docker --container-runtime=containerd +``` + +The `--container-runtime` flag must be set to "containerd" or "cri-o". +{{% /tab %}} +{{% /tabs %}} ## Special features diff --git a/site/content/en/docs/drivers/includes/docker_usage.inc b/site/content/en/docs/drivers/includes/docker_usage.inc deleted file mode 100644 index 1f757080f44e..000000000000 --- a/site/content/en/docs/drivers/includes/docker_usage.inc +++ /dev/null @@ -1,39 +0,0 @@ -## Requirements - -- [Install Docker](https://hub.docker.com/search?q=&type=edition&offering=community&sort=updated_at&order=desc) 18.09 or higher -- amd64 or arm64 system. - -## Usage - -Start a cluster using the docker driver: - -```shell -minikube start --driver=docker -``` -To make docker the default driver: - -```shell -minikube config set driver docker -``` - -## Rootless Docker -### Requirements -- Docker 20.10 or higher, see https://rootlesscontaine.rs/getting-started/docker/ -- Cgroup v2 delegation, see https://rootlesscontaine.rs/getting-started/common/cgroup2/ - -### Usage - -Start a cluster using the rootless docker driver: - -```shell -dockerd-rootless-setuptool.sh install -f -docker context use rootless - -minikube start --driver=docker --container-runtime=containerd -``` - -The `--container-runtime` flag must be set to "containerd" or "cri-o". - -The restrictions of rootless `kind` apply to minikube with rootless docker as well. - -See https://kind.sigs.k8s.io/docs/user/rootless/ . diff --git a/site/content/en/docs/tutorials/wsl_docker_driver.md b/site/content/en/docs/tutorials/wsl_docker_driver.md new file mode 100644 index 000000000000..c751c9973759 --- /dev/null +++ b/site/content/en/docs/tutorials/wsl_docker_driver.md @@ -0,0 +1,17 @@ +--- +title: "Setting Up WSL 2 & Docker Desktop" +linkTitle: "Setting Up WSL 2 & Docker Desktop" +weight: 1 +date: 2022-01-12 +--- + +## Overview + +- This guide will show you how to setup WSL 2 and Docker Desktop. + + +## Steps +Microsoft and Docker have in-depth guides for both, just follow along for a successful setup! + +1. [Install WSL](https://docs.microsoft.com/en-us/windows/wsl/install) +2. Install and setup [Docker Desktop for Windows](https://docs.docker.com/desktop/windows/wsl/#download) diff --git a/site/static/js/tabs.js b/site/static/js/tabs.js index 56ab6ca9b1c7..b7e4bd76b895 100644 --- a/site/static/js/tabs.js +++ b/site/static/js/tabs.js @@ -3,8 +3,8 @@ function initTabs() { try{ $('.tab-content').find('.tab-pane').each(function(idx, item) { var navTabs = $(this).closest('.code-tabs').find('.nav-tabs'), - title = escape($(this).attr('title')), - os = escape($(this).attr('os')); + title = escape($(this).attr('title')).replace(/%20/g, ' '), + os = escape($(this).attr('os') || ''); navTabs.append(''); });