mirror of https://github.com/docker/docs.git
Merge pull request #29 from sanscontext/cloud-fixes
fix bugs/html in cloud docs, remove two draft store docs
This commit is contained in:
John Mulhausen
GitHub
commit
6725383ede
|
|
@ -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.
|
||||
|
||||
|
||||
|
||||
The image in this example screenshot *exposes* port 80. Remember, this means
|
||||
|
|
|
|||
|
|
@ -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.)
|
||||
|
||||
|
||||
|
||||
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**.
|
||||
|
||||
|
||||
3. Edit the stack file, or upload a new one from your computer.
|
||||
4. Click **Save**.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
||||
|
||||
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.
|
||||
|
||||
|
||||
|
||||
Once the trigger is revoked, it stops accepting requests.
|
||||
|
|
|
|||
|
|
@ -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 <a href="https://forums.docker.com/c/docker-cloud/docker-security-scanning" target=_blank>Docker product forums</a>.**
|
||||
<b>We invite you to try it out! Send us your feedback through our <a href="https://forums.docker.com/c/docker-cloud/docker-security-scanning" target="_blank" >Docker Product Forums</a>.</b>
|
||||
|
||||
|
||||
#### Will Docker Security Scanning always be available for free?
|
||||
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
||||
|
||||
|
||||
To manually grant Docker Cloud access to a GitHub organization:
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ use <a href="https://github.com/docker/dockercloud-haproxy" target="_blank">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!</br>Hostname: web-1</br>Counter: Redis Cache not found, counter disabled.%
|
||||
$ curl lb-1.$DOCKER_ID_USER.cont.dockerapp.io
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ title: Docker Cloud
|
|||
# Welcome to the Docker Cloud Docs!
|
||||
|
||||
<center>
|
||||
|
||||
<img src="images/Docker-Cloud-Blue.png">
|
||||
</center>
|
||||
|
||||
<style type="text/css">
|
||||
|
|
@ -23,29 +23,28 @@ title: Docker Cloud
|
|||
|
||||
<table class="tg">
|
||||
<tr>
|
||||
<td class="sherbet" width="50%">[Tutorial: Getting Started](getting-started/index.md)</td>
|
||||
<td class="sherbet" width="50%">[Tutorial: Deploy an App](getting-started/deploy-app/index.md)</td>
|
||||
<td class="sherbet" width="50%"><a href="getting-started/index.md">Tutorial: Getting Started</a></td>
|
||||
<td class="sherbet" width="50%"><a href="getting-started/deploy-app/index.md">Tutorial: Deploy an App</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="plain" width="50%"><p>Start here! Deploy your first node and service in Docker Cloud.</p></td>
|
||||
<td class="plain" width="50%"><p>For more advanced beginners: deploy a simple app in Docker Cloud.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sherbet" width="50%">[Manage Apps](apps/index.md)</td>
|
||||
<td class="sherbet" width="50%">[Manage Builds and Images](builds/index.md)</td>
|
||||
<td class="sherbet" width="50%"><a href="apps/index.md">Manage Apps</a></td>
|
||||
<td class="sherbet" width="50%"><a href="builds/index.md">Manage Builds and Images</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="plain" width="50%"><p>Deploy services, stacks, and apps in Docker Cloud.</p></td>
|
||||
<td class="plain" width="50%"><p>Building images to deploy in Docker Cloud.</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sherbet" colspan=2>[Manage Infrastructure](infrastructure/index.md)</td>
|
||||
<td class="sherbet" colspan="2"><a href="infrastructure/index.md">Manage Infrastructure</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="plain" colspan=2><p>Learn how to link to your hosts, upgrade the Docker Cloud agent, and manage container distribution. See the [AWS FAQ](infrastructure/cloud-on-aws-faq.md) and [Packet.net FAQ](infrastructure/cloud-on-packet.net-faq.md)</p></td>
|
||||
<td class="plain" colspan="2"><p>Learn how to link to your hosts, upgrade the Docker Cloud agent, and manage container distribution. See the <a href="infrastructure/cloud-on-aws-faq.md">AWS FAQ</a> and <a href="infrastructure/cloud-on-packet.net-faq.md">Packet.net FAQ</a></p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="sherbet" colspan=2> <a href="https://docs.docker.com/apidocs/docker-cloud/">API Docs</a> || [Frequently Asked Questions](docker-errors-faq.md) || [Release Notes](release-notes.md)</td>
|
||||
<td class="sherbet" colspan="2"> <a href="https://docs.docker.com/apidocs/docker-cloud/">API Docs</a> || <a href="docker-errors-faq.md">Frequently Asked Questions</a> || <a href="release-notes.md">Release Notes</a></td>
|
||||
</tr>
|
||||
</table>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ You can still run `docker` CLI commands on a host that is running the Docker Clo
|
|||
|
||||
The dialog that appears lists the currently supported distributions of Linux, and provides a command that you can copy.
|
||||
This command includes a token that allows the agent to talk to Docker Cloud.
|
||||
|
||||
|
||||
|
||||
4. Copy the command to your clipboard.
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@ You can use the following `dockercloud-policy` to limit Docker Cloud to a specif
|
|||
The ARN string should look something like `arn:aws:iam::123456789123:role/dockercloud-role`. You'll use the ARN in the next step. If you forget to copy the ARN here, view the Role in IAM to see its related information including the ARN.
|
||||
|
||||
9. Click **Create Role**.
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -113,7 +114,9 @@ Once you've created the a `dockercloud-policy`, attached it to a
|
|||
|
||||
1. In Docker Cloud, click **Cloud settings** at the lower left.
|
||||
2. In the Cloud Providers section, click the plug icon next to Amazon Web Services.
|
||||
|
||||
|
||||
|
||||
3. Enter the full `Role ARN` for the role you just created.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ You can use add a public SSH key to the *authorized_keys* file in each of your n
|
|||
|
||||
First, generate a keypair using `ssh-keygen -t rsa`. If you have an existing keypair you prefer to use, you can skip this step, copy the public key to your clipboard and continue on to [create the authorizedkeys stack](ssh-into-a-node.md#create-a-stack-in-docker-cloud).
|
||||
|
||||
```
|
||||
```none
|
||||
$ ssh-keygen -t rsa
|
||||
Generating public/private rsa key pair.
|
||||
Enter file in which to save the key (/Users/borjaburgos/.ssh/id_rsa): dockercloud
|
||||
|
|
@ -89,7 +89,7 @@ Next, get the node's IP from Docker Cloud from the Node details page.
|
|||
|
||||
With that IP number, you can then SSH to the node as `root`.
|
||||
|
||||
```
|
||||
```none
|
||||
$ ssh -i ~/dockercloud root@104.236.69.138
|
||||
The authenticity of host '104.236.69.138 (104.236.69.138)' can't be established.
|
||||
RSA key fingerprint is 4b:22:71:39:53:4a:88:51:4b:a7:2e:ed:03:dd:a3:7f.
|
||||
|
|
|
|||
|
|
@ -1,133 +0,0 @@
|
|||
---
|
||||
description: Find images in Docker Store
|
||||
draft: true
|
||||
keywords:
|
||||
- Docker, docker, store, purchase images
|
||||
menu:
|
||||
main:
|
||||
parent: docker-store
|
||||
title: Use the Docker Store
|
||||
---
|
||||
|
||||
<!-- copied to the index so that this file appears -->
|
||||
|
||||
# Use the Docker Store
|
||||
|
||||
The Docker Store is in private Beta. [Sign up today](https://store.docker.com/beta)!
|
||||
|
||||
The Docker Store makes it easy to try and buy the services you need, for whatever architecture you're running on.
|
||||
|
||||
## Search and Browse
|
||||
|
||||
Type a search in the search bar. Click one of the suggested matches, or press
|
||||
`Enter` to run a full search. The search returns any results that match in the
|
||||
image name, description, or publisher name. If you run a complete search, you
|
||||
can also limit your results by the product category.
|
||||
|
||||
You can also click **Browse** from the top menu to see all of the images
|
||||
available in the Store, and filter them by category and architecture.
|
||||
|
||||
## Get an image from the Docker Store
|
||||
|
||||
Once you find an image you want, use the `docker pull` command from the
|
||||
image's Store listing to download it.
|
||||
|
||||
Some images may require that you accept the Terms of Service before you can pull
|
||||
them, and paid and subscription images may require that you provide billing
|
||||
information if you have not already done so.
|
||||
|
||||
Once you've accepted the Terms of Service and provided billing information,
|
||||
you'll see the `docker pull` command for the image. Copy this and paste it into
|
||||
your command shell.
|
||||
|
||||
## Types of images
|
||||
|
||||
Docker Store offers two types of images:
|
||||
|
||||
* **Docker Verified images**. These images are verified by Docker, have a high level of security, and generally subscribe to Docker best practices.
|
||||
* **Community/Hub images**. When you choose this option, you see images directly from Docker Hub. These images are not verified by Docker.
|
||||
|
||||
## What version do I need?
|
||||
|
||||
In many cases there will be multiple versions of an image available. Choose the
|
||||
image that is compatible with your architecture. Additionally, some versions may
|
||||
offer smaller base images sizes, or address specific security vulnerabilities.
|
||||
|
||||
To see a list of an image's versions, click **View all versions**.
|
||||
|
||||
## Docker Store Frequently Asked Questions
|
||||
|
||||
### How do I log in to the Docker Store?
|
||||
|
||||
Log in to the Docker Store using your free Docker ID. Don't have a Docker ID yet? Go to [Docker Cloud](https://cloud.docker.com/) to sign up, or use the `docker login` command to create a Docker ID from the command line.
|
||||
|
||||
### Where can I see all of my purchases?
|
||||
|
||||
To view your purchases, go to the account menu at the upper right corner, and
|
||||
click **Subscriptions**. The page that appears lists all of your active
|
||||
subscriptions, and any lapsed or canceled subscriptions.
|
||||
|
||||
### Can I buy subscriptions for my organization?
|
||||
|
||||
Yes! Members of an Organization's "Owners" team can buy images and subscriptions
|
||||
for use in their Organization. Once purchased, images are available for any
|
||||
organization member to pull.
|
||||
|
||||
Organization owners can view the organization's subscriptions by changing the
|
||||
selected account on the **Subscriptions** page.
|
||||
|
||||
### How can I become a Docker Store publisher?
|
||||
|
||||
You can apply to become a Docker Store publisher by filling out
|
||||
the form [here](https://store.docker.com/publisher/signup). When you've been
|
||||
accepted to the program, you'll set up a publisher profile and submit your
|
||||
images for review. Learn more about the publisher duties and requirements
|
||||
[here](https://success.docker.com/Store)
|
||||
|
||||
## Docker Store billing Frequently Asked Questions
|
||||
|
||||
### What forms of payment do you accept?
|
||||
|
||||
The Docker Store accepts Visa, MasterCard, American Express, and Discover credit
|
||||
cards. We do not accept ACH, EFT, or PIN-based debit card transactions at this
|
||||
time.
|
||||
|
||||
### What currencies do you accept?
|
||||
|
||||
Docker is a US-based company, and bills in US Dollars (USD). This keeps our
|
||||
pricing stable and consistent, rather than fluctuating with exchange rates.
|
||||
|
||||
### When do you charge my credit card?
|
||||
|
||||
We automatically charge your credit card on the first day of your billing cycle
|
||||
each month, and the charge will come from Docker, Inc. Your billing cycle is a
|
||||
30 day period starting on the day you subscribe.
|
||||
|
||||
### What do I do if my payment fails?
|
||||
|
||||
If your payment failed because the card expired or was canceled, you need to
|
||||
update your credit card information or add an additional card.
|
||||
|
||||
Click the user icon menu menu in the upper right corner, and click
|
||||
**Billing**. Click the **Payment methods** tab to update your credit card and
|
||||
contact information.
|
||||
|
||||
If you are updating the card details for an organization, be sure the select the
|
||||
organization name from the **Account** menu before updating the information.
|
||||
|
||||
### How does cancellation work? Do you offer refunds?
|
||||
|
||||
You can cancel a subscription at any time, however you will still be billed
|
||||
for the full month, and have access to the subscription content until the end of
|
||||
that billing period.
|
||||
|
||||
We do not offer refunds. If you believe that you’ve been billed in error,
|
||||
contact our [Billing Support team](mailto:billing@docker.com).
|
||||
|
||||
### How do I download the licenses my organization has purchased?
|
||||
|
||||
You can view and download your all active licenses for an organization from the
|
||||
Subscriptions page.
|
||||
|
||||
Click the user icon menu at the top right, choose **Subscriptions** and then
|
||||
select the organization from the **Accounts** drop down menu.
|
||||
|
|
@ -11,10 +11,10 @@ title: Docker Store Overview
|
|||
|
||||
# Docker Store Overview
|
||||
|
||||
<center>
|
||||
**The Docker Store is in private Beta. [Sign up today](https://store.docker.com/beta)!**
|
||||
|
||||
You can also [learn more about publishing](https://success.docker.com/Store), or [apply to be a publisher](https://store.docker.com/publisher/signup).
|
||||
<center>
|
||||
<b>The Docker Store is now in public Beta!</b><br/>
|
||||
You can also <a href="https://success.docker.com/Store">learn more about publishing</a>, or <a href="https://store.docker.com/publisher/signup">apply to be a publisher</a>.
|
||||
</center>
|
||||
|
||||
-----------------
|
||||
|
|
|
|||
|
|
@ -1,118 +0,0 @@
|
|||
---
|
||||
description: Publish to the Docker Store
|
||||
draft: true
|
||||
keywords:
|
||||
- Docker, docker, store, purchase images
|
||||
menu:
|
||||
main:
|
||||
parent: docker-store
|
||||
title: Become a Publisher
|
||||
---
|
||||
|
||||
# Become a Docker Store Publisher
|
||||
|
||||
Apply to become a Docker Store Publisher by signing up [here](https://store.docker.com/publisher/signup).
|
||||
|
||||
The Docker Store is an easy way for you to distribute and sell your Dockerized products. When you list your products as a Docker Publisher you get lots of benefits:
|
||||
|
||||
* **Access to our huge customer base.** Docker has had phenomenal adoption and
|
||||
is wildly popular in many environments. Customers using Docker also use Docker Hub and Docker Cloud, and soon the Docker Store, where they find and download Docker Content.
|
||||
|
||||
* **Seamless installation, updates, and upgrades.** Customers can try and buy from within their Docker environment, and we'll tell them when there are upgrades or updates available.
|
||||
|
||||
* **We'll handle checkout.** No shopping cart site hassles when you sell your products through the Docker Store - we'll handle that for you.
|
||||
|
||||
* **It’s a win-win situation.** Solid Content improves our product ecosystem, and our flexible products help you get your Content to market.
|
||||
|
||||
## What can I distribute in the Docker Store?
|
||||
|
||||
The Docker Store welcomes free, open-source, and subscription content. To offer
|
||||
content for sale, you can allow users to buy subscriptions through the Docker
|
||||
Store, or you can use the Docker Store to distribute your product and have users
|
||||
buy a license key from your own site.
|
||||
|
||||
## Sounds great! How do I become a Publisher?
|
||||
|
||||
Apply to become a Docker Store Publisher by signing up [here](https://store.docker.com/publisher/signup).
|
||||
|
||||
Once you're accepted to the program, you can expect the following steps in the process:
|
||||
|
||||
1. Fill out your Publisher profile.
|
||||
2. Provide information about the software you want to distribute
|
||||
3. Submit your images, with their information packets, for review.
|
||||
|
||||
**Provide high-quality images by following these guidelines**
|
||||
|
||||
### Create your publisher profile
|
||||
|
||||
Let the Docker community know who you are! Add your contact details, your
|
||||
company story, and tell us what you do.
|
||||
|
||||
At minimum, you must provide:
|
||||
|
||||
* Legal entity name
|
||||
* Short Description
|
||||
* Website
|
||||
* Phone number
|
||||
* Valid company email
|
||||
* Company Icon/logo (square; at least 512x512 px)
|
||||
|
||||
|
||||
### Create great content
|
||||
|
||||
Create your content, and follow our best practices to Dockerize it. Keep your
|
||||
images small, your layers few, and your components secure. As a member of our
|
||||
Publisher program, you'll receive help and support to create and maintain
|
||||
high-quality images that demonstrate Docker best practices.
|
||||
|
||||
Additionally, any images offered in the Docker Store must be free from known CVE
|
||||
vulnerabilities. Docker Cloud now provides Docker Security Scanning to help you
|
||||
spot and respond to vulnerabilities as they're announced.
|
||||
|
||||
### Support your users
|
||||
|
||||
Docker users who download your content from the Store might need your help
|
||||
later. Be prepared for questions! The information you provide with your
|
||||
submission will save support time later.
|
||||
|
||||
**Documentation**
|
||||
|
||||
If there is documentation about your product, make sure you include it in your
|
||||
submission. This could be links to a documentation site, or even a link to a
|
||||
README in Github. At the very least, this documentation must cover installing
|
||||
your content, and an overview of the software's capabilities and features.
|
||||
|
||||
**Support Information**
|
||||
|
||||
If you provide support along with your content, include that information.
|
||||
Is there a support website? What email address can users contact for help? Are
|
||||
there self-help or troubleshooting resources available?
|
||||
|
||||
**Support SLA**
|
||||
|
||||
Include a Service Level Agreement (SLA) for each image you're offering for the
|
||||
Store. A SLA is your commitment to your users about the nature and level of
|
||||
support you provide to them. Make sure your SLA includes support hours and
|
||||
response time expectations, where applicable.
|
||||
|
||||
### Product submission packet contents
|
||||
|
||||
You can apply to become a Docker Store Publisher at any time. However, when you
|
||||
submit an image for publication, you must provide the following information. Use
|
||||
this list below as a checklist when preparing a new submission.
|
||||
|
||||
* Link to the source repository or registry
|
||||
* Product **Name**.
|
||||
* Product **Version**, including the image, version, or tag names to include.
|
||||
* Product **Icon** or logo (square, at least 512x512 px)
|
||||
* Content **type**: Docker Container Image, Plugin, Cloud Service, or Composition.
|
||||
* Search tags.
|
||||
* List of **Categories** that apply to this product: Database, Networking, Business Software, etc.
|
||||
* List of **supported architectures**.
|
||||
* **Short description**: a one-to-two-sentence summary, 140 characters or fewer.
|
||||
* Long **description**: includes product details and any marketing copy.
|
||||
* **Installation instructions**.
|
||||
* Usage instructions and **documentation**.
|
||||
* Support link.
|
||||
* License type and link.
|
||||
* Screenshot(s).
|
||||
Loading…
Reference in New Issue