docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for snippets in lists

This commit is contained in:
John Mulhausen 2016-09-30 16:41:43 -07:00
parent 79fb2534f2
commit c35362633c
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ucp/installation/install-production.md
View File

@ -85,9 +85,9 @@ available, check the [reference documentation](../reference/install.md).
To install UCP: To install UCP:
1. Log in to the machine where you want to install UCP. 1. Log in to the machine where you want to install UCP.
2. Use the `docker/ucp install` command to install UCP. 2. Use the `docker/ucp install` command to install UCP.
In this example we'll be running the install command interactively, so that In this example we'll be running the install command interactively, so that
the command prompts for the necessary configuration values. the command prompts for the necessary configuration values.
@ -108,14 +108,12 @@ To install UCP:
* Also, include the `--external-server-cert` flag if you're using server * Also, include the `--external-server-cert` flag if you're using server
certificates signed by an external CA. certificates signed by an external CA.
</br>
When installing Docker UCP, overlay networking is automatically configured When installing Docker UCP, overlay networking is automatically configured
for you. If you are running Docker CS Engine 1.10, or have custom for you. If you are running Docker CS Engine 1.10, or have custom
configurations on your Docker CS Engine, you need to restart the Docker configurations on your Docker CS Engine, you need to restart the Docker
daemon at this point. daemon at this point.
3. Check that the UCP web application is running.
3. Check that the UCP web application is running.
In your browser, navigate to the address where you've installed UCP. In your browser, navigate to the address where you've installed UCP.
@ -141,7 +139,7 @@ root certificates and keys.
To create a backup of the CAs used on the controller node: To create a backup of the CAs used on the controller node:
1. Log into the controller node using ssh. 1. Log into the controller node using ssh.
2. Run the docker/ucp backup command. 2. Run the docker/ucp backup command.
```bash ```bash
$ docker run --rm -i --name ucp \ $ docker run --rm -i --name ucp \
@ -168,7 +166,7 @@ For each node that you want to install as a controller replica:
2. Make sure you transfer the backup.tar from the previous step to this node. 2. Make sure you transfer the backup.tar from the previous step to this node.
3. Use the join command with the replica option: 3. Use the join command with the replica option:
In this example we'll be running the join command interactively, so that In this example we'll be running the join command interactively, so that
the command prompts for the necessary configuration values. We'll also the command prompts for the necessary configuration values. We'll also
@ -214,7 +212,7 @@ For each controller node:
1. Log into that node using ssh. 1. Log into that node using ssh.
2. Run the engine-discovery command. 2. Run the engine-discovery command.
```bash ```bash
$ docker run --rm -it \ $ docker run --rm -it \
@ -233,8 +231,8 @@ For each node that you want to add to your UCP cluster:
1. Log into that node. 1. Log into that node.
2. Use the join command, to join the node to the cluster: 2. Use the join command, to join the node to the cluster:
```bash ```bash
$ docker run --rm -it --name ucp \ $ docker run --rm -it --name ucp \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \

10
ucp/installation/upgrade.md
View File

@ -88,13 +88,13 @@ replica nodes):
2. Log into the controller node using ssh. 2. Log into the controller node using ssh.
3. Pull the docker/ucp image for the version you want to upgrade to. 3. Pull the docker/ucp image for the version you want to upgrade to.
```bash ```bash
$ docker pull docker/ucp:$UCP_VERSION $ docker pull docker/ucp:$UCP_VERSION
``` ```
4. Upgrade the controller node. 4. Upgrade the controller node.
```bash ```bash
$ docker run --rm -it \ $ docker run --rm -it \
@ -169,14 +169,14 @@ If your cluster is set up for high-availability (has several controller nodes):
5. Log into the controller node using ssh. 5. Log into the controller node using ssh.
6. Pull the docker/ucp image for the version you want to upgrade to. 6. Pull the docker/ucp image for the version you want to upgrade to.
```bash ```bash
$ docker pull docker/ucp:$UCP_VERSION $ docker pull docker/ucp:$UCP_VERSION
``` ```
7. Upgrade the controller node. 7. Upgrade the controller node.
```bash ```bash
$ docker run --rm -it \ $ docker run --rm -it \
--name ucp \ --name ucp \

6
ucp/monitor/troubleshoot-ucp.md
View File

@ -35,7 +35,7 @@ logs.
You can also check the logs of UCP system containers from the CLI. This is You can also check the logs of UCP system containers from the CLI. This is
specially useful if the UCP web application is not working. specially useful if the UCP web application is not working.
1. Get a client certificate bundle. 1. Get a client certificate bundle.
When using the Docker CLI client you need to authenticate using client When using the Docker CLI client you need to authenticate using client
certificates. certificates.
@ -44,8 +44,8 @@ specially useful if the UCP web application is not working.
If your client certificate bundle is for a non-admin user, you won't have If your client certificate bundle is for a non-admin user, you won't have
permissions to see the UCP system containers. permissions to see the UCP system containers.
2. Check the logs of UCP system containers. 2. Check the logs of UCP system containers.
```bash ```bash
# By default system containers are not displayed. Use the -a flag to display them # By default system containers are not displayed. Use the -a flag to display them
$ docker ps -a $ docker ps -a