From 138d4df912a6983092431404eae78da3f172edb4 Mon Sep 17 00:00:00 2001
From: Lorenzo Fontana <lo@linux.com>
Date: Mon, 11 Dec 2017 21:53:19 +0100
Subject: [PATCH] Revamp rkt and add CRI-O as alternative runtime

Signed-off-by: Lorenzo Fontana <lo@linux.com>
---
 docs/getting-started-guides/minikube.md | 33 +++++++++++++++++++++----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/docs/getting-started-guides/minikube.md b/docs/getting-started-guides/minikube.md
index 370360435d26a..470a452c11f80 100644
--- a/docs/getting-started-guides/minikube.md
+++ b/docs/getting-started-guides/minikube.md
@@ -18,7 +18,7 @@ Minikube is a tool that makes it easy to run Kubernetes locally. Minikube runs a
   * NodePorts
   * ConfigMaps and Secrets
   * Dashboards
-  * Container Runtime: Docker, and [rkt](https://github.com/coreos/rkt)
+  * Container Runtime: Docker, [rkt](https://github.com/rkt/rkt) and [CRI-O](https://github.com/kubernetes-incubator/cri-o)
   * Enabling CNI (Container Network Interface)
   * Ingress
 
@@ -75,15 +75,38 @@ Stopping local Kubernetes cluster...
 Stopping "minikube"...
 ```
 
-### Using rkt container engine
+### Alternative Container Runtimes
 
-To use [rkt](https://github.com/coreos/rkt) as the container runtime run:
+#### CRI-O
+
+To use [CRI-O](https://github.com/kubernetes-incubator/cri-o) as the container runtime, run:
+
+```bash
+$ minikube start \
+    --network-plugin=cni \
+    --container-runtime=cri-o \
+    --bootstrapper=kubeadm
+```
+
+Or you can use the extended version:
+
+```bash
+$ minikube start \
+    --network-plugin=cni \
+    --extra-config=kubelet.container-runtime=remote \
+    --extra-config=kubelet.container-runtime-endpoint=/var/run/crio.sock \
+    --extra-config=image-service-endpoint=/var/run/crio.sock \
+    --bootstrapper=kubeadm
+```
+
+#### rkt container engine
+
+To use [rkt](https://github.com/rkt/rkt) as the container runtime run:
 
 ```shell
 $ minikube start \
     --network-plugin=cni \
-    --container-runtime=rkt \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.5/minikube-v0.0.5.iso
+    --container-runtime=rkt
 ```
 
 This will use an alternative minikube ISO image containing both rkt, and Docker, and enable CNI networking.