From 1928e2d80f88c7892ef4068162705fdb515c2da7 Mon Sep 17 00:00:00 2001 From: LRubin Date: Mon, 3 Oct 2016 15:29:12 -0700 Subject: [PATCH] fix bugs/html in cloud docs, remove two draft store docs Signed-off-by: LRubin --- docker-cloud/apps/ports.md | 1 + docker-cloud/apps/stacks.md | 3 + docker-cloud/apps/triggers.md | 3 + docker-cloud/builds/image-scan.md | 3 +- docker-cloud/builds/link-source.md | 1 + .../deploy-app/9_load-balance_the_service.md | 8 +- docker-cloud/index.md | 17 ++- docker-cloud/infrastructure/byoh.md | 1 + docker-cloud/infrastructure/link-aws.md | 3 + .../infrastructure/ssh-into-a-node.md | 4 +- docker-store/get-images.md | 133 ------------------ docker-store/index.md | 6 +- docker-store/join-us.md | 118 ---------------- 13 files changed, 31 insertions(+), 270 deletions(-) delete mode 100644 docker-store/get-images.md delete mode 100644 docker-store/join-us.md diff --git a/docker-cloud/apps/ports.md b/docker-cloud/apps/ports.md index c84487b0e6..5c20f7c4dc 100644 --- a/docker-cloud/apps/ports.md +++ b/docker-cloud/apps/ports.md @@ -32,6 +32,7 @@ If the image that you are using for your service already exposes any ports, thes 1. From the **Launch new service** wizard, select the image to use. 2. Scroll down to the **Ports** section. + ![](images/exposing-port.png) The image in this example screenshot *exposes* port 80. Remember, this means diff --git a/docker-cloud/apps/stacks.md b/docker-cloud/apps/stacks.md index 37d8a64d45..0aa039fa0b 100644 --- a/docker-cloud/apps/stacks.md +++ b/docker-cloud/apps/stacks.md @@ -55,7 +55,9 @@ To create a stack from the Docker Cloud web interface: 3. Click **Create**. 4. Enter a name for the stackfile. 5. Enter or paste the stack file in the **Stackfile** field, or drag a file to the field to upload it. (You can also click in the field to browse for and upload a file on your computer.) + ![](images/stack-create.png) + 6. Click **Create** or **Create and deploy**. ### Create a stack using the API @@ -97,6 +99,7 @@ To update a stack from the Docker Cloud web interface: 1. Navigate to the stack you want to update. 2. Click **Edit**. + ![](images/stack-edit.png) 3. Edit the stack file, or upload a new one from your computer. 4. Click **Save**. diff --git a/docker-cloud/apps/triggers.md b/docker-cloud/apps/triggers.md index 87f47ed6e7..6008cfb1b3 100644 --- a/docker-cloud/apps/triggers.md +++ b/docker-cloud/apps/triggers.md @@ -35,7 +35,9 @@ Docker Cloud supports two types of triggers: 1. Click the name of the service you want to create a trigger for 2. Go to the detail page and scroll down to the **Triggers** section. + ![](images/triggers-tab-blank.png) + 3. In the **Trigger name** field, enter a name for the trigger. 4. Select a trigger type. 5. Click the **+** (plus sign) icon. @@ -52,6 +54,7 @@ To stop a trigger from automatically scaling or redeploying, you must revoke it. 1. Go to the detail page of the service. 2. Scroll down to the **Triggers** section. 3. Click the **trashcan** icon for the trigger you want to revoke. + ![](images/revoke-trigger.png) Once the trigger is revoked, it stops accepting requests. diff --git a/docker-cloud/builds/image-scan.md b/docker-cloud/builds/image-scan.md index 0fcd112b91..cb6386d7ec 100644 --- a/docker-cloud/builds/image-scan.md +++ b/docker-cloud/builds/image-scan.md @@ -139,7 +139,8 @@ for a limited time. Security scanning is only available for Docker Official Images on Docker Hub, and for paid private repositories in Docker Cloud during this free period. -**We invite you to try it out! Send us your feedback through our Docker product forums.** +We invite you to try it out! Send us your feedback through our Docker Product Forums. + #### Will Docker Security Scanning always be available for free? diff --git a/docker-cloud/builds/link-source.md b/docker-cloud/builds/link-source.md index 5a6e76a0ef..0221454525 100644 --- a/docker-cloud/builds/link-source.md +++ b/docker-cloud/builds/link-source.md @@ -84,6 +84,7 @@ can often grant access at the same time as you link your user account. In this case, a **Grant access** button appears next to the organization name in the link accounts screen, as shown below. If this button does not appear, you must manually grant the application's access. + ![](images/link-source-github-org-lite.png) To manually grant Docker Cloud access to a GitHub organization: diff --git a/docker-cloud/getting-started/deploy-app/9_load-balance_the_service.md b/docker-cloud/getting-started/deploy-app/9_load-balance_the_service.md index 8153e415ea..11775c4d07 100644 --- a/docker-cloud/getting-started/deploy-app/9_load-balance_the_service.md +++ b/docker-cloud/getting-started/deploy-app/9_load-balance_the_service.md @@ -24,7 +24,7 @@ use Dock You can configure and run the `haproxy` load balancer service from the command line using a command like the example below. (If you are using the Go quickstart, edit the `link-service` value before running the command.) -```bash +```none $ docker-cloud service run \ -p 80:80/tcp \ --role global \ @@ -48,7 +48,7 @@ dockercloud/haproxy Run the `service ps` command to check if your service is already running. -``` +```none $ docker-cloud service ps NAME UUID STATUS IMAGE DEPLOYED web 68a6fb2c ▶ Running my-username/quickstart-python:latest 2 hours ago @@ -57,7 +57,7 @@ lb e81f3815 ▶ Running dockercloud/haproxy:latest Now let's check the container for this service. Run `docker-cloud container ps`. -``` +```none $ docker-cloud container ps NAME UUID STATUS IMAGE RUN COMMAND EXIT CODE DEPLOYED PORTS web-1 6c89f20e ▶ Running my-username/quickstart-python:latest python app.py 2 hours ago web-1.my-username.cont.dockerapp.io:49162->80/tcp @@ -69,7 +69,7 @@ You should notice an URL endpoint in the *PORT* column for haproxy-1. In the exa If you refresh or run curl multiple times you should see requests distributed between the two containers of in the `web` service. You can see which container responds to your request in the `Hostname` section of the response. -``` +```none $ curl lb-1.$DOCKER_ID_USER.cont.dockerapp.io Hello Friendly Users!
Hostname: web-1
Counter: Redis Cache not found, counter disabled.% $ curl lb-1.$DOCKER_ID_USER.cont.dockerapp.io diff --git a/docker-cloud/index.md b/docker-cloud/index.md index 1619ab4357..68a2c01cca 100644 --- a/docker-cloud/index.md +++ b/docker-cloud/index.md @@ -12,7 +12,7 @@ title: Docker Cloud # Welcome to the Docker Cloud Docs!
-![](images/Docker-Cloud-Blue.png) +