From c0974ef2a6f858d8f0147f02f3600a5944aa0aa7 Mon Sep 17 00:00:00 2001 From: Joao Fernandes Date: Wed, 9 Nov 2016 15:41:34 -0800 Subject: [PATCH] Fix code snippet highlight --- _data/toc.yaml | 4 ++-- datacenter/dtr/2.1/install/index.md | 12 ++++++------ datacenter/dtr/2.1/install/install-dtr-offline.md | 6 +++--- datacenter/dtr/2.1/install/upgrade.md | 4 ++-- datacenter/dtr/2.1/repos-and-images/index.md | 12 ++++++------ .../{dtr-integration.md => integrate-with-dtr.md} | 8 ++++---- .../{ldap-integration.md => integrate-with-ldap.md} | 0 datacenter/ucp/2.0/installation/install-offline.md | 8 ++++---- .../ucp/2.0/installation/install-production.md | 2 +- datacenter/ucp/2.0/installation/upgrade.md | 4 ++-- datacenter/ucp/2.0/monitor/monitor-ucp.md | 4 ++-- datacenter/ucp/2.0/monitor/troubleshoot-ucp.md | 2 +- 12 files changed, 33 insertions(+), 33 deletions(-) rename datacenter/ucp/2.0/configuration/{dtr-integration.md => integrate-with-dtr.md} (95%) rename datacenter/ucp/2.0/configuration/{ldap-integration.md => integrate-with-ldap.md} (100%) diff --git a/_data/toc.yaml b/_data/toc.yaml index 2b2d89aad0..b3d85f8bc8 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -695,9 +695,9 @@ toc: title: Use externally-signed certificates - path: /datacenter/ucp/2.0/configuration/configure-logs/ title: Configure UCP logging - - path: /datacenter/ucp/2.0/configuration/dtr-integration/ + - path: /datacenter/ucp/2.0/configuration/integrate-with-dtr/ title: Integrate with Docker Trusted Registry - - path: /datacenter/ucp/2.0/configuration/ldap-integration/ + - path: /datacenter/ucp/2.0/configuration/integrate-with-ldap/ title: Integrate with LDAP - path: /datacenter/ucp/2.0/configuration/route-hostnames/ title: Route hostnames to services diff --git a/datacenter/dtr/2.1/install/index.md b/datacenter/dtr/2.1/install/index.md index 738d29bc18..61cdc4a70f 100644 --- a/datacenter/dtr/2.1/install/index.md +++ b/datacenter/dtr/2.1/install/index.md @@ -31,13 +31,13 @@ install, configure, and backup DTR. To install DTR: -1. Get the DTR package. +1. Get the DTR package. ```bash $ wget https://packages.docker.com/caas/ucp-2.0.0-beta3_dtr-2.1.0-beta3.tar.gz -O docker-datacenter.tar.gz ``` -2. Transfer the package to the nodes. +2. Transfer the package to the nodes. Now that you have the DTR package in your machine, you can transfer it to the nodes that you want to install DTR. For each node run: @@ -46,7 +46,7 @@ To install DTR: $ scp docker-datacenter.tag.gz @:/tmp ``` -3. Load the images. +3. Load the images. Once the package is on the nodes where you want to install DTR, you can use the `docker load` command, to load the images from the .tar file. Log @@ -56,14 +56,14 @@ To install DTR: $ docker load < /tmp/docker-datacenter.tar.gz ``` -4. Download a UCP client bundle. +4. Download a UCP client bundle. Having a UCP client bundle allows you to run Docker commands on a swarm being managed by UCP. [Download a UCP client bundle](https://docs.docker.com/ucp/access-ucp/cli-based-access/) and set up your CLI client to use it. -5. Run the following commands to install DTR. +5. Run the following commands to install DTR. ```bash @@ -132,7 +132,7 @@ replicas: 2. Load you UCP user bundle. -3. Run the join command. +3. Run the join command. When you join a replica to a DTR cluster, you need to specify the ID of a replica that is already part of the cluster. You can find an diff --git a/datacenter/dtr/2.1/install/install-dtr-offline.md b/datacenter/dtr/2.1/install/install-dtr-offline.md index 1217f5bdd3..b2d0866dd1 100644 --- a/datacenter/dtr/2.1/install/install-dtr-offline.md +++ b/datacenter/dtr/2.1/install/install-dtr-offline.md @@ -14,7 +14,7 @@ of pulling the DTR images from Docker Hub, you use a computer that is connected to the internet to download a single package with all DTR images. Then you copy that package to the nodes where you’ll install DTR. -1. Get the DTR package. +1. Get the DTR package. Use a computer with internet access to download a single package with all Docker Datacenter components: @@ -23,7 +23,7 @@ copy that package to the nodes where you’ll install DTR. $ wget https://packages.docker.com/caas/ucp-2.0.0-beta3_dtr-2.1.0-beta3.tar.gz -O docker-datacenter.tar.gz ``` -2. Transfer the package to the offline nodes. +2. Transfer the package to the offline nodes. Now that you have the DTR package in your machine, you can transfer it to the nodes that you want to install DTR. For each node run: @@ -34,7 +34,7 @@ copy that package to the nodes where you’ll install DTR. 3. Login into the nodes where you transferred the images. -4. Load the images. +4. Load the images. Once the package is on the nodes where you want to install DTR, you can use the `docker load` command, to load the images from the .tar file. On each diff --git a/datacenter/dtr/2.1/install/upgrade.md b/datacenter/dtr/2.1/install/upgrade.md index 6ff50df1a7..053536f890 100644 --- a/datacenter/dtr/2.1/install/upgrade.md +++ b/datacenter/dtr/2.1/install/upgrade.md @@ -28,7 +28,7 @@ To upgrade DTR you use the `upgrade` command. Having a UCP client bundle allows you to run Docker commands on a UCP cluster. Download a UCP client bundle and set up your CLI client to use it. -2. Pull the latest `docker/dtr` image. +2. Pull the latest `docker/dtr` image. ```bash $ docker pull docker/dtr: @@ -38,7 +38,7 @@ To upgrade DTR you use the `upgrade` command. use a machine with internet connection to [pull all the DTR images](../install-dtr-offline.md). -4. Run the upgrade command. +4. Run the upgrade command. The upgrade command upgrades all DTR replicas that are part of your cluster: diff --git a/datacenter/dtr/2.1/repos-and-images/index.md b/datacenter/dtr/2.1/repos-and-images/index.md index 9bec8f9398..1480883bc1 100644 --- a/datacenter/dtr/2.1/repos-and-images/index.md +++ b/datacenter/dtr/2.1/repos-and-images/index.md @@ -49,21 +49,21 @@ $ sudo /bin/systemctl restart docker.service ### Boot2Docker -1. Login into the virtual machine with ssh: +1. Login into the virtual machine with ssh: ```bash docker-machine ssh ``` -2. Create the `bootsync.sh` file, and make it executable: +2. Create the `bootsync.sh` file, and make it executable: ```bash sudo touch /var/lib/boot2docker/bootsync.sh sudo chmod 755 /var/lib/boot2docker/bootsync.sh ``` -3. Add the following content to the `bootsync.sh` file. You can use nano or vi -for this. +3. Add the following content to the `bootsync.sh` file. You can use nano or vi + for this. ```bash #!/bin/sh @@ -71,13 +71,13 @@ for this. cat /var/lib/boot2docker/server.pem >> /etc/ssl/certs/ca-certificates.crt ``` -4. Add the DTR CA certificate to the `server.pem` file: +4. Add the DTR CA certificate to the `server.pem` file: ```bash curl -k https:///ca | sudo tee -a /var/lib/boot2docker/server.pem ``` -5. Run `bootsync.sh` and restart the Docker daemon: +5. Run `bootsync.sh` and restart the Docker daemon: ```bash sudo /var/lib/boot2docker/bootsync.sh diff --git a/datacenter/ucp/2.0/configuration/dtr-integration.md b/datacenter/ucp/2.0/configuration/integrate-with-dtr.md similarity index 95% rename from datacenter/ucp/2.0/configuration/dtr-integration.md rename to datacenter/ucp/2.0/configuration/integrate-with-dtr.md index d37eaa3938..5c9d41e9c9 100644 --- a/datacenter/ucp/2.0/configuration/dtr-integration.md +++ b/datacenter/ucp/2.0/configuration/integrate-with-dtr.md @@ -65,25 +65,25 @@ images from a UCP node to a private DTR repository. 2. Use a [UCP client bundle](../access-ucp/cli-based-access.md) to run docker commands in the UCP cluster. -3. Pull an image from Docker Hub: +3. Pull an image from Docker Hub: ```bash $ docker pull hello-world ``` -4. Retag the image: +4. Retag the image: ```bash $ docker tag hello-world:latest //hello-world:1 ``` -5. Push the image from the UCP node to your private registry: +5. Push the image from the UCP node to your private registry: ```bash $ docker push //hello-world:1 ``` -6. Validate that your image is now stored on DTR. +6. Validate that your image is now stored on DTR. When successfully pushing the image you should see a result like: diff --git a/datacenter/ucp/2.0/configuration/ldap-integration.md b/datacenter/ucp/2.0/configuration/integrate-with-ldap.md similarity index 100% rename from datacenter/ucp/2.0/configuration/ldap-integration.md rename to datacenter/ucp/2.0/configuration/integrate-with-ldap.md diff --git a/datacenter/ucp/2.0/installation/install-offline.md b/datacenter/ucp/2.0/installation/install-offline.md index 5e75535336..75130cd4e0 100644 --- a/datacenter/ucp/2.0/installation/install-offline.md +++ b/datacenter/ucp/2.0/installation/install-offline.md @@ -15,7 +15,7 @@ computer that is connected to the internet to download a single package with all the images. Then you copy that package to the host where you’ll install UCP. -1. Get the UCP package. +1. Get the UCP package. Use a computer with internet access to download a single package with all Docker Datacenter components: @@ -24,7 +24,7 @@ all the images. Then you copy that package to the host where you’ll install UC $ wget https://packages.docker.com/caas/ucp-2.0.0-beta3_dtr-2.1.0-beta3.tar.gz -O docker-datacenter.tar.gz ``` -2. Transfer the package to the offline nodes. +2. Transfer the package to the offline nodes. Now that you have the UCP package in your machine, you can transfer it to the host that you want to manage with UCP. For each host: @@ -35,7 +35,7 @@ all the images. Then you copy that package to the host where you’ll install UC 3. Login into the hosts where you transferred the images. -4. Load the UCP images. +4. Load the UCP images. Once the UCP package is transferred to the hosts, you can use the `docker load` command, to load the images from the tar archive. On each @@ -45,7 +45,7 @@ all the images. Then you copy that package to the host where you’ll install UC $ docker load < docker-datacenter.tar.gz ``` -5. Install Docker UCP. +5. Install Docker UCP. Now that the offline hosts have all the images needed to install UCP, you can [install Docker UCP that host](install-production.md). diff --git a/datacenter/ucp/2.0/installation/install-production.md b/datacenter/ucp/2.0/installation/install-production.md index c87879644b..535a219845 100644 --- a/datacenter/ucp/2.0/installation/install-production.md +++ b/datacenter/ucp/2.0/installation/install-production.md @@ -50,7 +50,7 @@ To install UCP: 1. Use ssh to log in into the host where you want to install UCP. -2. Run the following command: +2. Run the following command: ```bash $ docker run --rm -it --name ucp \ diff --git a/datacenter/ucp/2.0/installation/upgrade.md b/datacenter/ucp/2.0/installation/upgrade.md index fed1e7efde..f057ae253f 100644 --- a/datacenter/ucp/2.0/installation/upgrade.md +++ b/datacenter/ucp/2.0/installation/upgrade.md @@ -65,14 +65,14 @@ can be the first node where you installed UCP or any controller replica that you've installed using that node's root CA material. 1. Log into the controller node using ssh. -2. Pull the docker/ucp image for the version you want to upgrade to. +2. Pull the docker/ucp image for the version you want to upgrade to. ```bash # Check on Docker Hub which versions are available $ docker pull docker/ucp: ``` -3. Upgrade UCP by running: +3. Upgrade UCP by running: ```bash $ docker run --rm -it \ diff --git a/datacenter/ucp/2.0/monitor/monitor-ucp.md b/datacenter/ucp/2.0/monitor/monitor-ucp.md index e02907ff2b..b6dd24f830 100644 --- a/datacenter/ucp/2.0/monitor/monitor-ucp.md +++ b/datacenter/ucp/2.0/monitor/monitor-ucp.md @@ -45,7 +45,7 @@ You can also monitor the status of a UCP cluster, using the Docker CLI client. permissions to execute all docker commands, or see all information about the cluster. -2. Use the `docker info` command to check the cluster status. +2. Use the `docker info` command to check the cluster status. ```bash $ docker info @@ -63,7 +63,7 @@ You can also monitor the status of a UCP cluster, using the Docker CLI client. └ KV: etcd://192.168.99.100:12379 ``` -3. Check the container logs +3. Check the container logs With an admin user certificate bundle, you can run docker commands directly on the Docker Engine or Swarm Manager of a node. In this example, we are diff --git a/datacenter/ucp/2.0/monitor/troubleshoot-ucp.md b/datacenter/ucp/2.0/monitor/troubleshoot-ucp.md index 8a4179911a..39853f7de1 100644 --- a/datacenter/ucp/2.0/monitor/troubleshoot-ucp.md +++ b/datacenter/ucp/2.0/monitor/troubleshoot-ucp.md @@ -37,7 +37,7 @@ 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 permissions to see the UCP system containers. -2. Check the logs of UCP system containers. +2. Check the logs of UCP system containers. ```bash # By default system containers are not displayed. Use the -a flag to display them