Merge pull request #951 from cheld/fix-page-rendering

fix rendering issue of docker.md
This commit is contained in:
Jared
2016-08-03 11:38:27 -07:00
committed by GitHub
+11 -5
View File
@@ -20,11 +20,13 @@ Here's a diagram of what the final result will look like:
**Note: These steps have not been tested with the [Docker For Mac or Docker For Windows beta programs](https://blog.docker.com/2016/03/docker-for-mac-windows-beta/).** **Note: These steps have not been tested with the [Docker For Mac or Docker For Windows beta programs](https://blog.docker.com/2016/03/docker-for-mac-windows-beta/).**
1. You need to have Docker version >= "1.10" installed on the machine. 1) You need to have Docker version >= "1.10" installed on the machine.
2. Enable mount propagation. Hyperkube is running in a container which has to mount volumes for other containers, for example in case of persistent storage. The required steps depend on the init system.
2) Enable mount propagation. Hyperkube is running in a container which has to mount volumes for other containers, for example in case of persistent storage. The required steps depend on the init system.
In case of **systemd**, change MountFlags in the Docker unit file to shared. In case of **systemd**, change MountFlags in the Docker unit file to shared.
```shell ```shell
DOCKER_CONF=$(systemctl cat docker | head -1 | awk '{print $2}') DOCKER_CONF=$(systemctl cat docker | head -1 | awk '{print $2}')
sed -i.bak 's/^\(MountFlags=\).*/\1shared/' $DOCKER_CONF sed -i.bak 's/^\(MountFlags=\).*/\1shared/' $DOCKER_CONF
@@ -33,6 +35,7 @@ Here's a diagram of what the final result will look like:
``` ```
**Otherwise**, manually set the mount point used by Hyperkube to be shared: **Otherwise**, manually set the mount point used by Hyperkube to be shared:
```shell ```shell
mkdir -p /var/lib/kubelet mkdir -p /var/lib/kubelet
mount --bind /var/lib/kubelet /var/lib/kubelet mount --bind /var/lib/kubelet /var/lib/kubelet
@@ -42,7 +45,9 @@ Here's a diagram of what the final result will look like:
### Run it ### Run it
1. Decide which Kubernetes version to use. Set the `${K8S_VERSION}` variable to a version of Kubernetes >= "v1.2.0". #### Step 1: Decide which Kubernetes version to use
Set the `${K8S_VERSION}` variable to a version of Kubernetes >= "v1.2.0".
If you'd like to use the current **stable** version of Kubernetes, run the following: If you'd like to use the current **stable** version of Kubernetes, run the following:
@@ -57,7 +62,7 @@ Here's a diagram of what the final result will look like:
export K8S_VERSION=$(curl -sS https://storage.googleapis.com/kubernetes-release/release/latest.txt) export K8S_VERSION=$(curl -sS https://storage.googleapis.com/kubernetes-release/release/latest.txt)
``` ```
2. Start Hyperkube #### Step 2: Start Hyperkube
```shell ```shell
export ARCH=amd64 export ARCH=amd64
@@ -93,7 +98,8 @@ Here's a diagram of what the final result will look like:
This actually runs the kubelet, which in turn runs a [pod](/docs/user-guide/pods/) that contains the other master components. This actually runs the kubelet, which in turn runs a [pod](/docs/user-guide/pods/) that contains the other master components.
** **SECURITY WARNING** ** services exposed via Kubernetes using Hyperkube are available on the host node's public network interface / IP address. Because of this, this guide is not suitable for any host node/server that is directly internet accessible. Refer to [#21735](https://github.com/kubernetes/kubernetes/issues/21735) for addtional info. **SECURITY WARNING**: Services exposed via Kubernetes using Hyperkube are available on the host node's public network interface / IP address. Because of this, this guide is not suitable for any host node/server that is directly internet accessible. Refer to [#21735](https://github.com/kubernetes/kubernetes/issues/21735) for addtional info.
### Download `kubectl` ### Download `kubectl`