diff --git a/_data/advisories.yaml b/_data/advisories.yaml index 50af4ac8bd..aae8d29938 100644 --- a/_data/advisories.yaml +++ b/_data/advisories.yaml @@ -4,8 +4,8 @@ # Define Advisory texts -# can be used in page frontmatter, e.g.: -# advisory: experimental +# can be used in page frontmatter: +# advisory = "experimental" texts: experimental: "The functionality described on this page is marked as Experimental, and as such, may change before it becomes generally available." @@ -17,7 +17,6 @@ texts: swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product." swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. In Docker 1.12 and higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode — a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/), [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands), and the advanced [Learn Docker sample app](/engine/getstarted-voting-app/). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands." engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker for Mac and Docker for Windows are currently in Beta." - cloud-swarm: "**Beta Feature.** Swarm Mode for Docker Cloud is currently a public Beta." # URL based advisories diff --git a/_data/previewdocs.yaml b/_data/previewdocs.yaml deleted file mode 100644 index 37c933ccea..0000000000 --- a/_data/previewdocs.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# Define Advisory texts -# can be used in page frontmatter, e.g.: -# previewflag: cloud-swarm -# modeled on advisories - -texts: - - cloud-swarm: "**Beta Feature.** Swarm Mode for Docker Cloud is currently a public Beta." - - -# URL based previewdocs -# any URL that begins with "/engine/" will get the "engine" preview -# will be over-ridden by the `previewdocs` frontmatter in the topic diff --git a/_data/toc.yaml b/_data/toc.yaml index c689d874c9..bda940d2b8 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -919,7 +919,72 @@ manuals: title: Docker Cloud Settings and Docker ID - path: /docker-cloud/orgs/ title: Organizations and Teams - + - sectiontitle: Getting Started + section: + - path: /docker-cloud/getting-started/intro_cloud/ + title: Introducing Docker Cloud + - path: /docker-cloud/getting-started/connect-infra/ + title: Link to your Infrastructure + - path: /docker-cloud/getting-started/your_first_node/ + title: Deploy your first node + - path: /docker-cloud/getting-started/your_first_service/ + title: Deploy your first service + - sectiontitle: Deploy an application + section: + - path: /docker-cloud/getting-started/deploy-app/1_introduction/ + title: Introduction to Deploying an app in Docker Cloud + - path: /docker-cloud/getting-started/deploy-app/2_set_up/ + title: Set up your environment + - path: /docker-cloud/getting-started/deploy-app/3_prepare_the_app/ + title: Prepare the application + - path: /docker-cloud/getting-started/deploy-app/4_push_to_cloud_registry/ + title: Push the image to Docker Cloud's Registry + - path: /docker-cloud/getting-started/deploy-app/5_deploy_the_app_as_a_service/ + title: Deploy the app as a Docker Cloud service + - path: /docker-cloud/getting-started/deploy-app/6_define_environment_variables/ + title: Define environment variables + - path: /docker-cloud/getting-started/deploy-app/7_scale_the_service/ + title: Scale the service + - path: /docker-cloud/getting-started/deploy-app/8_view_logs/ + title: View service logs + - path: /docker-cloud/getting-started/deploy-app/9_load-balance_the_service/ + title: Load-balance the service + - path: /docker-cloud/getting-started/deploy-app/10_provision_a_data_backend_for_your_service/ + title: Provision a data backend for the service + - path: /docker-cloud/getting-started/deploy-app/11_service_stacks/ + title: Stackfiles for your service + - path: /docker-cloud/getting-started/deploy-app/12_data_management_with_volumes/ + title: Data management with Volumes + - sectiontitle: Manage Applications + section: + - path: /docker-cloud/apps/deploy-to-cloud-btn/ + title: Add a Deploy to Docker Cloud button + - path: /docker-cloud/apps/auto-destroy/ + title: Automatic container destroy + - path: /docker-cloud/apps/autorestart/ + title: Automatic container restart + - path: /docker-cloud/apps/auto-redeploy/ + title: Automatic service redeploy + - path: /docker-cloud/apps/load-balance-hello-world/ + title: Create a proxy or load balancer + - path: /docker-cloud/apps/deploy-tags/ + title: Deployment tags + - path: /docker-cloud/apps/stacks/ + title: Manage service stacks + - path: /docker-cloud/apps/ports/ + title: Publish and expose service or container ports + - path: /docker-cloud/apps/service-redeploy/ + title: Redeploy running services + - path: /docker-cloud/apps/service-scaling/ + title: Scale your service + - path: /docker-cloud/apps/api-roles/ + title: Service API Roles + - path: /docker-cloud/apps/service-links/ + title: Service discovery and links + - path: /docker-cloud/apps/triggers/ + title: Use triggers + - path: /docker-cloud/apps/volumes/ + title: Work with data volumes - sectiontitle: Manage Builds and Images section: - path: /docker-cloud/builds/ @@ -938,21 +1003,7 @@ manuals: title: Automated repository tests - path: /docker-cloud/builds/advanced/ title: Advanced options for Autobuild and Autotest - - sectiontitle: Manage Swarms (Beta Swarm Mode) - section: - - path: /docker-cloud/cloud-swarm/ - title: Overview - - path: /docker-cloud/cloud-swarm/using-swarm-mode/ - title: Using Swarm Mode - - path: /docker-cloud/cloud-swarm/register-swarms/ - title: Register existing swarms - - path: /docker-cloud/cloud-swarm/create-cloud-swarm/ - title: Create a new swarm in Docker Cloud - - path: /docker-cloud/cloud-swarm/connect-to-swarm/ - title: Connect to a swarm through Docker Cloud - - path: /docker-cloud/cloud-swarm/link-aws-swarm/ - title: Link to Amazon Web Services to create Swarms - - sectiontitle: Manage Infrastructure (Standard Mode) + - sectiontitle: Manage Infrastructure section: - path: /docker-cloud/infrastructure/ title: Infrastructure Overview @@ -978,87 +1029,18 @@ manuals: title: Using Docker Cloud and Packet.net - path: /docker-cloud/infrastructure/cloud-on-aws-faq/ title: Using Docker Cloud on AWS - - sectiontitle: Manage Nodes and Apps (Standard Mode) - section: - - path: /docker-cloud/standard/ - title: Overview - - sectiontitle: Getting Started - section: - - path: /docker-cloud/getting-started/ - title: Getting started with Docker Cloud - - path: /docker-cloud/getting-started/intro_cloud/ - title: Introducing Docker Cloud - - path: /docker-cloud/getting-started/connect-infra/ - title: Link to your Infrastructure - - path: /docker-cloud/getting-started/your_first_node/ - title: Deploy your first node - - path: /docker-cloud/getting-started/your_first_service/ - title: Deploy your first service - - sectiontitle: Deploy an application - section: - - path: /docker-cloud/getting-started/deploy-app/1_introduction/ - title: Introduction to Deploying an app in Docker Cloud - - path: /docker-cloud/getting-started/deploy-app/2_set_up/ - title: Set up your environment - - path: /docker-cloud/getting-started/deploy-app/3_prepare_the_app/ - title: Prepare the application - - path: /docker-cloud/getting-started/deploy-app/4_push_to_cloud_registry/ - title: Push the image to Docker Cloud's Registry - - path: /docker-cloud/getting-started/deploy-app/5_deploy_the_app_as_a_service/ - title: Deploy the app as a Docker Cloud service - - path: /docker-cloud/getting-started/deploy-app/6_define_environment_variables/ - title: Define environment variables - - path: /docker-cloud/getting-started/deploy-app/7_scale_the_service/ - title: Scale the service - - path: /docker-cloud/getting-started/deploy-app/8_view_logs/ - title: View service logs - - path: /docker-cloud/getting-started/deploy-app/9_load-balance_the_service/ - title: Load-balance the service - - path: /docker-cloud/getting-started/deploy-app/10_provision_a_data_backend_for_your_service/ - title: Provision a data backend for the service - - path: /docker-cloud/getting-started/deploy-app/11_service_stacks/ - title: Stackfiles for your service - - path: /docker-cloud/getting-started/deploy-app/12_data_management_with_volumes/ - title: Data management with Volumes - - sectiontitle: Manage Applications - section: - - path: /docker-cloud/apps/ - title: Applications in Docker Cloud - - path: /docker-cloud/apps/deploy-to-cloud-btn/ - title: Add a Deploy to Docker Cloud button - - path: /docker-cloud/apps/auto-destroy/ - title: Automatic container destroy - - path: /docker-cloud/apps/autorestart/ - title: Automatic container restart - - path: /docker-cloud/apps/auto-redeploy/ - title: Automatic service redeploy - - path: /docker-cloud/apps/load-balance-hello-world/ - title: Create a proxy or load balancer - - path: /docker-cloud/apps/deploy-tags/ - title: Deployment tags - - path: /docker-cloud/apps/stacks/ - title: Manage service stacks - - path: /docker-cloud/apps/ports/ - title: Publish and expose service or container ports - - path: /docker-cloud/apps/service-redeploy/ - title: Redeploy running services - - path: /docker-cloud/apps/service-scaling/ - title: Scale your service - - path: /docker-cloud/apps/api-roles/ - title: Service API Roles - - path: /docker-cloud/apps/service-links/ - title: Service discovery and links - - path: /docker-cloud/apps/triggers/ - title: Use triggers - - path: /docker-cloud/apps/volumes/ - title: Work with data volumes - - path: /docker-cloud/apps/stack-yaml-reference/ - title: Cloud stack file YAML reference + - title: Cloud API reference + path: /apidocs/docker-cloud/ + - title: Cloud stack file YAML reference + path: /docker-cloud/apps/stack-yaml-reference/ - path: /docker-cloud/slack-integration/ title: Docker Cloud notifications in Slack - path: /apidocs/docker-cloud/ title: Docker Cloud API nosync: true + - path: /docker-cloud/apps/stack-yaml-reference/ + title: Stack file YAML reference + nosync: true - path: /docker-cloud/installing-cli/ title: The Docker Cloud CLI - path: /docker-cloud/docker-errors-faq/ diff --git a/_layouts/docs.html b/_layouts/docs.html index 471c5dc902..462b6d3e3c 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -218,9 +218,6 @@ ng\:form {
{% if page.title %}

{{ page.title }}

{% endif %} {% if page.advisory %}
{{ site.data.advisories.texts[page.advisory] | markdownify }}
{% endif %} - - {% if page.previewflag %}
{{ site.data.previewdocs.texts[page.previewflag] | markdownify }}
{% endif %} - {% unless page.tree == false %}{% include read_time.html %}{% endunless %} {{ content }} {% if page.noratings != true %} diff --git a/docker-cloud/apps/api-roles.md b/docker-cloud/apps/api-roles.md index 1a8abdc133..3084ba0eae 100644 --- a/docker-cloud/apps/api-roles.md +++ b/docker-cloud/apps/api-roles.md @@ -4,7 +4,6 @@ keywords: API, Services, roles redirect_from: - /docker-cloud/feature-reference/api-roles/ title: Service API roles -notoc: true --- You can configure a service so that it can access the Docker Cloud API. When you @@ -32,4 +31,4 @@ $ curl -H "Authorization: $DOCKERCLOUD_AUTH" -H "Accept: application/json" $WEB_ For example, you can use information retrieved using the API to read the linked endpoints, and use them to reconfigure a proxy container. -See the [API documentation](/apidocs/docker-cloud.md) for more information on the different API operations available. +See the [API documentation](/apidocs/docker-cloud.md) for more information on the different API operations available. \ No newline at end of file diff --git a/docker-cloud/apps/deploy-to-cloud-btn.md b/docker-cloud/apps/deploy-to-cloud-btn.md index 127ddc3dba..1f9bd14102 100644 --- a/docker-cloud/apps/deploy-to-cloud-btn.md +++ b/docker-cloud/apps/deploy-to-cloud-btn.md @@ -18,10 +18,7 @@ This is an example button to deploy our -The button redirects the user to the **Launch new Stack** wizard, with the stack -definition already filled with the contents of any of the following files (which -are fetched in the order shown) from the repository (taking into account branch -and relative path): +The button redirects the user to the **Launch new Stack** wizard, with the stack definition already filled with the contents of any of the following files (which are fetched in the order shown) from the repository (taking into account branch and relative path): * `docker-cloud.yml` * `docker-compose.yml` @@ -29,6 +26,8 @@ and relative path): The user can still modify the stack definition before deployment. + + ## Adding the 'Deploy to Docker Cloud' button in GitHub You can simply add the following snippet to your `README.md` file: diff --git a/docker-cloud/apps/index.md b/docker-cloud/apps/index.md index 7b131a251c..1ff30a0c24 100644 --- a/docker-cloud/apps/index.md +++ b/docker-cloud/apps/index.md @@ -2,7 +2,6 @@ description: Manage your Docker Cloud Applications keywords: applications, reference, Cloud title: Applications in Docker Cloud -notoc: true --- Applications in Docker Cloud are usually several Services linked together using diff --git a/docker-cloud/apps/stack-yaml-reference.md b/docker-cloud/apps/stack-yaml-reference.md index db01aad31d..9f5671459a 100644 --- a/docker-cloud/apps/stack-yaml-reference.md +++ b/docker-cloud/apps/stack-yaml-reference.md @@ -3,7 +3,7 @@ description: Stack YAML reference keywords: YAML, stack, reference redirect_from: - /docker-cloud/feature-reference/stack-yaml-reference/ -title: Cloud stack file YAML reference +title: Stack file YAML reference --- A stack is a collection of services that make up an application in a specific environment. Learn more about stacks [here](stacks.md). A **stack file** is a file in YAML format that defines one or more services, similar to a `docker-compose.yml` file but with a few extensions. The default name for this file is `docker-cloud.yml`. @@ -320,4 +320,4 @@ Stack files (`docker-cloud.yml`) were designed with `docker-compose.yml` in mind build external_links env_file -``` +``` \ No newline at end of file diff --git a/docker-cloud/builds/images/repo-general.png b/docker-cloud/builds/images/repo-general.png index c4f72a7190..70808b35f7 100644 Binary files a/docker-cloud/builds/images/repo-general.png and b/docker-cloud/builds/images/repo-general.png differ diff --git a/docker-cloud/builds/index.md b/docker-cloud/builds/index.md index 2ed6ab0484..73349e5fc9 100644 --- a/docker-cloud/builds/index.md +++ b/docker-cloud/builds/index.md @@ -1,8 +1,8 @@ --- description: Manage Builds and Images in Docker Cloud keywords: builds, images, Cloud -title: Builds and images overview notoc: true +title: Builds and images overview --- Docker Cloud provides a hosted registry service where you can create @@ -23,4 +23,4 @@ running services when a build passes its tests. * [Automated repository tests](automated-testing.md) * [Advanced options for Autobuild and Autotest](advanced.md) -![Docker Cloud repository General view](images/repo-general.png) +![a Docker Cloud repository's General view](images/repo-general.png) \ No newline at end of file diff --git a/docker-cloud/builds/push-images.md b/docker-cloud/builds/push-images.md index d79209916e..cd6e77d23e 100644 --- a/docker-cloud/builds/push-images.md +++ b/docker-cloud/builds/push-images.md @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/intermediate/pushing-images-to-dockercloud/ - /docker-cloud/tutorials/pushing-images-to-dockercloud/ title: Push images to Docker Cloud -notoc: true --- Docker Cloud uses Docker Hub as its native registry for storing both public and diff --git a/docker-cloud/builds/repos.md b/docker-cloud/builds/repos.md index a909375290..6f5829a8aa 100644 --- a/docker-cloud/builds/repos.md +++ b/docker-cloud/builds/repos.md @@ -9,7 +9,7 @@ repositories and manually [push images](push-images.md) using `docker push`, or you can link to a source code provider and use [automated builds](automated-build.md) to build the images for you. These repositories can be either public or private. -![Docker Cloud repository General view](images/repo-general.png) +![a Docker Cloud repository's General view](images/repo-general.png) Additionally, you can access your Docker Hub repositories and automated builds from within Docker Cloud. diff --git a/docker-cloud/cloud-swarm/connect-to-swarm.md b/docker-cloud/cloud-swarm/connect-to-swarm.md deleted file mode 100644 index 5f6872d65d..0000000000 --- a/docker-cloud/cloud-swarm/connect-to-swarm.md +++ /dev/null @@ -1,45 +0,0 @@ ---- -previewflag: cloud-swarm -description: how to register and unregister swarms in Docker Cloud -keywords: swarm mode, swarms, orchestration Cloud, fleet management -title: Connect to a swarm through Docker Cloud ---- - -Docker Cloud allows you to connect your local Docker Engine to any swarm you -have access to in Docker Cloud. To do this, you run a proxy container in your -local Docker instance, which connects to a manager node on the target swarm. - -## Connect to a swarm - -1. Log in to Docker Cloud in your web browser. -2. Click **Swarms** in the top navigation, and click the name of the swarm you want to connect to. -3. Copy the command provided in the dialog that appears. -4. In a terminal window connected to your local Docker Engine, paste the command, and press **Enter**. - - The local Docker Engine downloads a containerized Docker Cloud client tool, and connects to the swarm. - -5. To complete the connection process, run the `export DOCKER_HOST` command found in the previous command's output, to connect your local shell to the client proxy. - - Be sure to include the client connection port in the URL. For example `export DOCKER_HOST=tcp://127.0.0.1:32768`. - - -To switch Docker hosts you can either run the `export` command again to overwrite it, or use `unset DOCKER_HOST`. - -> **Note**: If you are using Docker Machine, be sure to unset `DOCKER_TLS_VERIFY` as described in the [known issues](https://github.com/docker/dockercloud-federation#known-issues). - -## Reconnect a swarm - -If you accidentally unregister a swarm from Docker Cloud, or decide that you -want to re-register the swarm after it has been removed, you can -[re-register it](register-swarms.md#register-a-swarm) using the same -process as a normal registration. If the swarm is registered to -an organization, its access permissions were deleted when it was -unregistered, and must be recreated. - -> **Note**: You cannot register a new or different swarm under the name of a -swarm that was unregistered. To re-register a swarm, it must have the same swarm -ID as it did when previously registered. - -## Where to go next - -Learn how to [create a new swarm in Docker Cloud](create-cloud-swarm.md). diff --git a/docker-cloud/cloud-swarm/create-cloud-swarm.md b/docker-cloud/cloud-swarm/create-cloud-swarm.md index 7de616418a..bb58ed2e98 100644 --- a/docker-cloud/cloud-swarm/create-cloud-swarm.md +++ b/docker-cloud/cloud-swarm/create-cloud-swarm.md @@ -1,10 +1,14 @@ --- -previewflag: cloud-swarm description: Create new swarms in Docker Cloud keywords: swarm mode, swarms, create swarm, Cloud title: Create a new swarm in Docker Cloud --- +Note: All Swarm management features in Docker Cloud are free while in Beta. +{: style="text-align:center" } + +-------- + You can now create _new_ Docker Swarms from within Docker Cloud as well as register existing swarms. @@ -20,7 +24,7 @@ forwards your commands directly to the Docker instances running in the swarm. > **Note**: To create a swarm, you need to give Docker Cloud permission to deploy swarm nodes on your behalf in your cloud services provider account. See the [AWS with swarm instructions](link-aws-swarm.md) to learn more. -1. If necessary, log in to Docker Cloud and switch to Swarm Mode. +1. If necessary, log in to Docker Cloud and switch to Swarm mode. 2. Click Swarms in the top navigation. 3. Click **Create**. 4. Enter a name for the new swarm. @@ -43,14 +47,3 @@ forwards your commands directly to the Docker instances running in the swarm. Docker Cloud connects to your AWS account, deploys Docker for AWS instances, forms a Swarm, and joins the instances to it. > **Note**: At this time, you cannot dissolve swarms or delete swarm nodes from within Docker Cloud - you can only unregister the swarm from the Docker Cloud UI. To delete the swarm and its members, log in to your AWS account and delete them manually. - -## Where to go next - -Learn how to [connect to a swarm through Docker Cloud](connect-to-swarm.md). - -Learn how to [register existing swarms](register-swarms.md). - -You can get an overivew of topics on [swarms in Docker Cloud](index.md). - -To find out more about Docker swarm in general, see the Docker engine -[Swarm Mode overview](/engine/swarm/). diff --git a/docker-cloud/cloud-swarm/images/cloud-swarm-home.png b/docker-cloud/cloud-swarm/images/cloud-swarm-home.png deleted file mode 100644 index 9a79204792..0000000000 Binary files a/docker-cloud/cloud-swarm/images/cloud-swarm-home.png and /dev/null differ diff --git a/docker-cloud/cloud-swarm/images/cloud-swarms.png b/docker-cloud/cloud-swarm/images/cloud-swarms.png deleted file mode 100644 index 753922a0d0..0000000000 Binary files a/docker-cloud/cloud-swarm/images/cloud-swarms.png and /dev/null differ diff --git a/docker-cloud/cloud-swarm/index.md b/docker-cloud/cloud-swarm/index.md index 30a9a8c7ff..9048b3faf5 100644 --- a/docker-cloud/cloud-swarm/index.md +++ b/docker-cloud/cloud-swarm/index.md @@ -1,29 +1,165 @@ --- -previewflag: cloud-swarm description: Work with swarms in Docker Cloud keywords: swarm mode, swarms, orchestration Cloud, fleet management -title: Swarms in Docker Cloud (Beta) -notoc: true +title: Swarms in Docker Cloud --- -Docker Cloud now allows you to connect to clusters -of Docker Engines running in v1.13 -[swarm mode](/engine/swarm/). +
-With Beta Swarm Mode in Docker Cloud, you can -provision swarms to popular cloud providers, or -register existing swarms to Docker Cloud. -Use your Docker ID to authenticate and securely access -personal or team swarms. +Note: All Swarm management features in Docker Cloud are free while in Beta. +{: style="text-align:center" } -* [Using Swarm Mode with Docker Cloud](using-swarm-mode.md) +-------- +Docker Cloud now allows you to connect to clusters of Docker Engines running in v1.13 [Swarm Mode](/engine/swarm/). -* [Swarm Mode and organizations](using-swarm-mode.md#swarm-mode-and-organizations) +## Enable Swarm Mode in Docker Cloud -* [Register existing swarms](register-swarms.md) +By default, Docker Cloud allows you to manage [node clusters](/docker-cloud/infrastructure/), but you can opt in to use the Beta +Swarm Mode features. Swarm management replaces the node cluster management +features when the Swarm Mode interface is enabled. -* [Create a new swarm in Docker Cloud](create-cloud-swarm.md) +Click the **Swarm Mode** toggle to enable the swarm mode interface. -* [Connect to a swarm through Docker Cloud](connect-to-swarm.md) +![the Swarm Mode toggle](images/swarm-toggle.png) -* [Link to Amazon Web Services to create Swarms](link-aws-swarm.md) +You can switch between node cluster and swarm mode at any time, and enabling swarm mode does _not_ remove or disconnect existing node clusters. + +## Swarm mode and organizations + +If you use Docker Cloud in an [organization](/docker-cloud/orgs/), you can +use Swarm Mode to access any Docker swarms available to your organization. +Members of the `owners` team grant each team in an organization access to the +swarms they need. If necessary, you can create new teams to manage beta swarm +access. + +If you use swarm mode as a member of a team other than the `owners` team, +you will only see the swarms that you have been granted access to. + +Members of the `owners` team must switch to the Swarm Mode Docker Cloud +interface to grant teams access to an organization's swarms. Swarms only appear +in the [resource management](/docker-cloud/orgs/#/set-team-permissions) screens +for teams when in the swarm mode interface. + +## Register an existing swarm + +At this time, you cannot _create_ swarms from within Docker Cloud. However you can register existing swarms as part of the beta functionality. + +Before you begin, you need the following: + +- a Docker ID +- a Docker swarm composed of v1.13 (or later) Docker Engine nodes +- a terminal session connected to one of the swarm's manager nodes +- incoming port 2376 unblocked on that manager node + +> **Note**: The IP to the manager node for your swarm must be open and publicly accessible so that Docker Cloud can connect and run commands. + +To register an existing swarm in Docker Cloud: + +1. Log in to Docker Cloud if necessary. +2. If necessary, click the **Swarm mode** toggle to activate the Swarm Mode interface. +3. Click **Swarms** in the top navigation. +4. Click **Bring your own swarm** +5. Select the whole command displayed in the dialog, and copy it to your clipboard. +6. In terminal or another shell, connect to the Docker Engine running in the swarm's manager node using SSH. +7. Paste the command you copied into the terminal session connected to the manager node. +8. When prompted, log in using your Docker ID and password. + + The registration process uses your Docker ID to determine which namespaces you have access to. Once you log in, the CLI lists these namespaces to help you with the next step. + +9. Enter a name, with a namespace before the name if needed, and press Enter. + + If you do not enter a name, the swarm is registered to your Docker ID account using the swarm ID, which the long string displayed before the shell prompt. For example, the prompt might look like this: + + ```none + Enter a name for the new cluster [mydockerid/5rdshkgzn1sw016zimgckzx3j]: + ``` + + Enter a name at the prompt to prevent Docker Cloud from registering the swarm using the long swarm ID as the name. + + To register a swarm with an organization, prefix the new name with the organization name, for example `myorganization/myteamswarm`. + +The manager node pulls the `dockercloud/registration` container which creates a +global service called `dockercloud-server-proxy`. This service runs on _all_ of +the swarm's manager nodes. + +The swarm then appears in the **Swarms** screen in Docker Cloud. + +### Swarm Registration example + +```none +$ docker run -ti --rm -v /var/run/docker.sock:/var/run/docker.sock dockercloud/registration +Use your Docker ID credentials to authenticate: +Username: myusername +Password: + +Available namespaces: +* myorganization +* pacificocean +* sealife +Enter name for the new cluster [myusername/1btbwtge4xwjj0mjpdpr7jutn]: myusername/myswarm +Registering this Docker cluster with Docker Cloud... +Successfully registered the node as myswarm +You can now access this cluster using the following command in any Docker Engine: + docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_HOST dockercloud/client myswarm +``` + +## Swarm statuses in Docker Cloud + +Swarms that are registered in Docker Cloud appear in the Swarms list. Each line in the list shows the swarm's status. The statuses are: + + +- **DEPLOYED**: the swarm is sending heartbeat pings to Docker Cloud, and Cloud can contact it to run a health check. +- **UNREACHABLE**: the swarm is sending heartbeart pings, but Docker Cloud cannot contact the swarm. +- **UNAVAILABLE**: Docker Cloud is not receiving any heartbeats from the swarm. +- **REMOVED**: the swarm has been unregistered from Docker Cloud and will be removed from the list soon. + +> **Note**: [Removing a swarm](#unregister-a-swarm-from-Docker-cloud) only removes the swarm from the interface in Docker Cloud. It does not change the swarm itself or any processes running on the swarm. + +## Connect to a swarm through Docker Cloud + +Docker Cloud allows you to connect your local Docker Engine to any swarm you +have access to in Docker Cloud. To do this, you run a proxy container in your local Docker instance, which connects to a manager node on the target swarm. + +1. Log in to Docker Cloud in your web browser. +2. Click **Swarms** in the top navigation, and click the name of the swarm you want to connect to. +3. Copy the command provided in the dialog that appears. +4. In a terminal window connected to your local Docker Engine, paste the command, and press **Enter**. + + The local Docker Engine downloads a containerized Docker Cloud client tool, and connects to the swarm. + +5. To complete the connection process, run the `export DOCKER_HOST` command found in the previous command's output, to connect your local shell to the client proxy. + + Be sure to include the client connection port in the URL. For example `export DOCKER_HOST=tcp://127.0.0.1:32768`. + + +To switch Docker hosts you can either run the `export` command again to overwrite it, or use `unset DOCKER_HOST`. + +> **Note**: If you are using Docker Machine, be sure to unset `DOCKER_TLS_VERIFY` as described in the [known issues](https://github.com/docker/dockercloud-federation#known-issues). + +## Unregister a swarm from Docker Cloud + +Unregistering a swarm from Docker Cloud only removes the swarm from Docker +Cloud, deletes any access rights granted to teams, and disables proxy +connections. Unregistering does not stop the services, containers, or processes on the swarm, and it does not disband the swarm or terminate the nodes. + +To unregister a swarm from Docker Cloud: + +1. Log in to Docker Cloud if necessary. +2. Click **Swarms** in the top navigation. +3. Put your mouse cursor on the swarm you want to unregister. +4. Click the trash can icon that appears. +5. In the confirmation dialog that appears, click **Remove**. + +Docker Cloud marks the swarm as `REMOVED` and removes the swarm from the list in the next few minutes. + +## Reconnect a swarm + +If you accidentally unregister a swarm from Docker Cloud, or decide that you +want to re-register the swarm after it has been removed, you can re-register it +using the same process as a normal registration. If the swarm is registered to +an organization, its access permissions were deleted when it was unregistered, +and must be recreated. + +> **Note**: You cannot register a new or different swarm under the name of a +swarm that was unregistered. To re-register a swarm, it must have the same swarm +ID as it did when previously registered. diff --git a/docker-cloud/cloud-swarm/link-aws-swarm.md b/docker-cloud/cloud-swarm/link-aws-swarm.md index 20bb2348dc..008fd99086 100644 --- a/docker-cloud/cloud-swarm/link-aws-swarm.md +++ b/docker-cloud/cloud-swarm/link-aws-swarm.md @@ -1,5 +1,4 @@ --- -previewflag: cloud-swarm description: Link your Amazon Web Services account keywords: AWS, Cloud, link title: Link to Amazon Web Services to create Swarms @@ -87,15 +86,11 @@ Cloud to connect the account. You're now ready to deploy a swarm! -## Where to go next - -For next steps, see [create a new swarm in Docker Cloud](create-cloud-swarm.md). - -You can get an overivew of topics on [swarms in Docker Cloud](index.md). - + +  diff --git a/docker-cloud/cloud-swarm/register-swarms.md b/docker-cloud/cloud-swarm/register-swarms.md deleted file mode 100644 index a46565daaa..0000000000 --- a/docker-cloud/cloud-swarm/register-swarms.md +++ /dev/null @@ -1,106 +0,0 @@ ---- -previewflag: cloud-swarm -description: how to register and unregister swarms in Docker Cloud -keywords: register swarms, unregister swarms -title: Register existing swarms ---- - -With Beta Swarm Mode, you can register existing -swarms with Docker Cloud to easily -manage multiple swarms running anywhere. - -Before you begin, you need the following: - -- a Docker ID -- a Docker swarm composed of v1.13 (or later) Docker Engine nodes -- a terminal session connected to one of the swarm's manager nodes -- incoming port 2376 unblocked on that manager node - -> **Note**: The IP to the manager node for your swarm must be open and publicly accessible so that Docker Cloud can connect and run commands. - -## Register a swarm - -To register an existing swarm in Docker Cloud: - -1. Log in to Docker Cloud if necessary. -2. If necessary, click the **Swarm Mode** toggle to activate the Swarm Mode interface. -3. Click **Swarms** in the top navigation. -4. Click **Bring your own swarm** -5. Select the whole command displayed in the dialog, and copy it to your clipboard. -6. In terminal or another shell, connect to the Docker Engine running in the swarm's manager node using SSH. -7. Paste the command you copied into the terminal session connected to the manager node. -8. When prompted, log in using your Docker ID and password. - - The registration process uses your Docker ID to determine which namespaces you have access to. Once you log in, the CLI lists these namespaces to help you with the next step. - -9. Enter a name, with a namespace before the name if needed, and press Enter. - - If you do not enter a name, the swarm is registered to your Docker ID account using the swarm ID, which the long string displayed before the shell prompt. For example, the prompt might look like this: - - ```none - Enter a name for the new cluster [mydockerid/5rdshkgzn1sw016zimgckzx3j]: - ``` - - Enter a name at the prompt to prevent Docker Cloud from registering the swarm using the long swarm ID as the name. - - To register a swarm with an organization, prefix the new name with the organization name, for example `myorganization/myteamswarm`. - -The manager node pulls the `dockercloud/registration` container which creates a -global service called `dockercloud-server-proxy`. This service runs on _all_ of -the swarm's manager nodes. - -The swarm then appears in the **Swarms** screen in Docker Cloud. - -### Swarm Registration example - -```none -$ docker run -ti --rm -v /var/run/docker.sock:/var/run/docker.sock dockercloud/registration -Use your Docker ID credentials to authenticate: -Username: myusername -Password: - -Available namespaces: -* myorganization -* pacificocean -* sealife -Enter name for the new cluster [myusername/1btbwtge4xwjj0mjpdpr7jutn]: myusername/myswarm -Registering this Docker cluster with Docker Cloud... -Successfully registered the node as myswarm -You can now access this cluster using the following command in any Docker Engine: - docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_HOST dockercloud/client myswarm -``` - -![List of swarms in Docker Cloud](images/cloud-swarms.png) - -## Swarm statuses in Docker Cloud - -Swarms that are registered in Docker Cloud appear in the Swarms list. Each line in the list shows the swarm's status. The statuses are: - - -- **DEPLOYED**: the swarm is sending heartbeat pings to Docker Cloud, and Cloud can contact it to run a health check. -- **UNREACHABLE**: the swarm is sending heartbeart pings, but Docker Cloud cannot contact the swarm. -- **UNAVAILABLE**: Docker Cloud is not receiving any heartbeats from the swarm. -- **REMOVED**: the swarm has been unregistered from Docker Cloud and will be removed from the list soon. - -> **Note**: [Removing a swarm](#unregister-a-swarm-from-docker-cloud) only removes the swarm from the interface in Docker Cloud. It does not change the swarm itself or any processes running on the swarm. - -## Unregister a swarm from Docker Cloud - -Unregistering a swarm from Docker Cloud only removes the swarm from Docker -Cloud, deletes any access rights granted to teams, and disables proxy -connections. Unregistering does not stop the services, containers, or processes on the swarm, and it does not disband the swarm or terminate the nodes. - -To unregister a swarm from Docker Cloud: - -1. Log in to Docker Cloud if necessary. -2. Click **Swarms** in the top navigation. -3. Put your mouse cursor on the swarm you want to unregister. -4. Click the trash can icon that appears. -5. In the confirmation dialog that appears, click **Remove**. - -Docker Cloud marks the swarm as `REMOVED` and removes the swarm from the list in -the next few minutes. - -## Where to go next - -Learn how to [connect to a swarm through Docker Cloud](connect-to-swarm.md). diff --git a/docker-cloud/cloud-swarm/using-swarm-mode.md b/docker-cloud/cloud-swarm/using-swarm-mode.md deleted file mode 100644 index e3997169d4..0000000000 --- a/docker-cloud/cloud-swarm/using-swarm-mode.md +++ /dev/null @@ -1,61 +0,0 @@ ---- -previewflag: cloud-swarm -description: Work with swarms in Docker Cloud -keywords: swarm mode, swarms, orchestration Cloud, fleet management -title: Using Swarm Mode with Docker Cloud ---- - -Docker Cloud now allows you to connect to clusters of Docker Engines running in v1.13 [swarm mode](/engine/swarm/). - -## Swarm Mode - -The current release of Docker Cloud automatically opts in new users to Beta -Swarm Mode. - -> **Note:** All Swarm management features in Docker Cloud are free while in Beta. - -### New to Docker Cloud? - -If you just signed up as a new Docker Cloud user, -Swarm Mode is baked into the standard web -interface. Once you sign in, you are ready to -get started managing and deploying your apps in -Docker Cloud! - -### Already a Docker Cloud user? - -If you are already a Docker Cloud user, you will still have access to legacy -features for managing [node clusters](/docker-cloud/infrastructure/). You also -have the option to switch to the Beta Swarm Mode interface. Swarm management -replaces node cluster management features when Swarm Mode is enabled. - -#### Enable Swarm Mode in Docker Cloud - -Click the **Swarm Mode** toggle to enable the Swarm Mode interface. - -![the Swarm Mode toggle](images/swarm-toggle.png) - -You can switch between node cluster and Swarm Mode at any time, and enabling -Swarm Mode does _not_ remove or disconnect existing node clusters. The content, -stacks, and node clusters you already created will be available to you and -collaborators. - -## Swarm Mode and organizations - -If you use Docker Cloud in an [organization](/docker-cloud/orgs/), you can -use Swarm Mode to access any Docker swarms available to your organization. -Members of the `owners` team grant each team in an organization access to the -swarms they need. If necessary, you can create new teams to manage beta swarm -access. - -If you use Swarm Mode as a member of a team other than the `owners` team, -you will only see the swarms that you have been granted access to. - -Members of the `owners` team must switch to the Swarm Mode Docker Cloud -interface to grant teams access to an organization's swarms. Swarms only appear -in the [resource management](/docker-cloud/orgs/#/set-team-permissions) screens -for teams when in the Swarm Mode interface. - -## Where to go next - -Learn how to [register an existing swarm](register-swarms.md). diff --git a/docker-cloud/getting-started/deploy-app/10_provision_a_data_backend_for_your_service.md b/docker-cloud/getting-started/deploy-app/10_provision_a_data_backend_for_your_service.md index a4cb4d25e4..54082c36ba 100644 --- a/docker-cloud/getting-started/deploy-app/10_provision_a_data_backend_for_your_service.md +++ b/docker-cloud/getting-started/deploy-app/10_provision_a_data_backend_for_your_service.md @@ -15,8 +15,6 @@ until now. In this step you'll add a data backend that your service will use. In this specific tutorial we'll use a Redis cache, but most concepts apply to any data backend. -## Provision the service - The first step is to provision the data service itself. Run this command to create and run the Redis service using the redis image: @@ -39,7 +37,7 @@ web bf644f91 ▶ Running my-username/python-quickstart lb 2f0d4b38 ▶ Running dockercloud/haproxy:latest 25 minutes ago ``` -## Link the web service to the redis service +### Link the web service to the redis service Next, we'll set up the link between the `redis` service and the `web` service. @@ -66,6 +64,4 @@ $ curl lb-1.$DOCKER_ID_USER.cont.dockerapp.io Hello World
Hostname: web-3
Counter: 5% ``` -## What's Next? - Next, we'll look at [Stackfiles for your service](11_service_stacks.md) diff --git a/docker-cloud/getting-started/deploy-app/11_service_stacks.md b/docker-cloud/getting-started/deploy-app/11_service_stacks.md index acafddda57..d5931fb48d 100644 --- a/docker-cloud/getting-started/deploy-app/11_service_stacks.md +++ b/docker-cloud/getting-started/deploy-app/11_service_stacks.md @@ -4,22 +4,13 @@ keywords: Python, service, stack redirect_from: - /docker-cloud/getting-started/python/11_service_stacks/ title: Stackfiles for your service -notoc: true --- -A stack is a logical grouping of related services that are usually deployed -together and require each other to work as intended. If you are familiar with -*fig* or *Docker Compose* then you should feel right at home with **stacks**. -You can learn more about stacks [here](../../apps/stacks.md). +A stack is a logical grouping of related services that are usually deployed together and require each other to work as intended. If you are familiar with *fig* or *Docker Compose* then you should feel right at home with **stacks**. You can learn more about stacks [here](../../apps/stacks.md). -Stack files are YAML files, and you can learn more about the available syntax -[here](../../apps/stack-yaml-reference.md). You can also interact with stacks -using the [stack commands in our API](/apidocs/docker-cloud.md#stacks). +Stack files are YAML files, and you can learn more about the available syntax [here](../../apps/stack-yaml-reference.md). You can also interact with stacks using the [stack commands in our API](/apidocs/docker-cloud.md#stacks). -## Service definitions in the stack file - -The services that you created in this tutorial form a stack with three services: -the load-balancer, the web application and the redis cache. +The services that you created in this tutorial form a stack with three services: the load-balancer, the web application and the redis cache. Look at the file called `docker-cloud.yml` in your quickstart to see the stack file that defines the three services (lb, web, redis) you created in the @@ -57,15 +48,13 @@ redis: - REDIS_APPENDFSYNC=always ``` -You can use this stack file to quickly deploy this cluster of three services to -another set of nodes. You can also edit the file to change the configuration. +You can use this stack file to quickly deploy this cluster of three services to another set of nodes. You can also edit the file to change the configuration. -## Run a stack +### Run a stack To create the services in a stack file you use the simple `stack up` command. -You can run this in the path containing your stackfile (docker-cloud.yml), like -so: +You can run this in the path containing your stackfile (docker-cloud.yml), like so: ```bash $ docker-cloud stack up @@ -77,6 +66,4 @@ Or you can specify the YML file to use and its location: $ docker-cloud up -f /usr/dockercloud/quickstart-python/docker-cloud.yml ``` -## What's Next? - -Next, we'll do some [Data management with Volumes](12_data_management_with_volumes.md) +Next, we'll do some [Data management with Volumes](12_data_management_with_volumes.md) \ No newline at end of file diff --git a/docker-cloud/getting-started/deploy-app/12_data_management_with_volumes.md b/docker-cloud/getting-started/deploy-app/12_data_management_with_volumes.md index eb9cb656d0..0ad7484da5 100644 --- a/docker-cloud/getting-started/deploy-app/12_data_management_with_volumes.md +++ b/docker-cloud/getting-started/deploy-app/12_data_management_with_volumes.md @@ -12,14 +12,14 @@ the container crashed, the data would be lost. To save the data so it persists beyond the life of a container, or share data from one container to another, you'll need to define a volume. -## Data persistence +### Data persistence In order to persist, data in Docker Cloud must be stored in a volume. The volume can be defined on the image (for example in the Dockerfile), or specified when you create a new service in the Docker Cloud web UI. Learn more about volumes in Docker Cloud [here](/docker-cloud/apps/volumes.md). -### Test for lack of persistence +#### Test for lack of persistence If you `redeploy` the Redis service you created earlier, you'll see that the counter resets. @@ -47,7 +47,7 @@ $ curl lb-1.$DOCKER_ID_USER.cont.dockerapp.io:80 The Redis cache service redeployment caused the counter to reset. -### Enabling persistence +#### Enabling persistence The specific Redis image (*redis*) in this tutorial supports data persistence. This is not a common requirement for a Redis cache and it's not enabled by @@ -108,14 +108,14 @@ $ curl lb-1.$DOCKER_ID_USER.cont.dockerapp.io:80 Congratulations! You've set up data persistence in Docker Cloud! -## Sharing/reusing data volumes between services +### Sharing/reusing data volumes between services A service's volume can be accessed by another service. To do this you use the `--volumes-from` flag when creating the new service. You might use this functionality to share data between two services, or to back up, restore, or migrate a volume to a local host or a cloud storage provider. -## Download volume data for backup +### Download volume data for backup In this next step, you'll download the `/data` volume from Redis to your local host using SCP (secure copy). @@ -133,7 +133,7 @@ $ scp -r -P 2222 root@downloader-1.$DOCKER_ID_USER.svc.dockerapp.io:/data . You now have a backup copy of the Redis data on your local host machine! -## What's Next? +## Where to next? Congratulations! You've completed the tutorials! You can now push an image to Docker Cloud, deploy an app to your Cloud nodes, set environment variables, diff --git a/docker-cloud/getting-started/deploy-app/1_introduction.md b/docker-cloud/getting-started/deploy-app/1_introduction.md index 73eab1a5d9..0ed4b13322 100644 --- a/docker-cloud/getting-started/deploy-app/1_introduction.md +++ b/docker-cloud/getting-started/deploy-app/1_introduction.md @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/python/1_introduction/ - /docker-cloud/getting-started/golang/1_introduction/ title: Introduction to deploying an app in Docker Cloud -notoc: true --- In this tutorial you will bring an application to Docker Cloud using either Go @@ -19,8 +18,6 @@ This tutorial assumes that you have: - at least one node running. If you don't have any nodes set up in Docker Cloud yet, [start here](../../getting-started/your_first_node.md) to set these up. - Docker Engine installed - see the installation guides for macOS, Windows and Linux. You'll use the `docker login` command to connect to your account in Docker Cloud, so you can run `docker-cloud` CLI commands. -## What's next? - Let's get started! [Set up your environment](2_set_up.md). diff --git a/docker-cloud/getting-started/deploy-app/3_prepare_the_app.md b/docker-cloud/getting-started/deploy-app/3_prepare_the_app.md index 2d791b0dfd..ef338fe909 100644 --- a/docker-cloud/getting-started/deploy-app/3_prepare_the_app.md +++ b/docker-cloud/getting-started/deploy-app/3_prepare_the_app.md @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/python/3_prepare_the_app/ - /docker-cloud/getting-started/golang/3_prepare_the_app/ title: Prepare the application -notoc: true --- In this step, you will prepare a simple application that can be deployed. @@ -45,6 +44,4 @@ $ docker build --tag quickstart-python . $ docker build --tag quickstart-go . ``` -## What's next? - -Next, we [Push the Docker image to Docker Cloud's Registry](4_push_to_cloud_registry.md). +Next, we [Push the Docker image to Docker Cloud's Registry](4_push_to_cloud_registry.md). \ No newline at end of file diff --git a/docker-cloud/getting-started/deploy-app/4_push_to_cloud_registry.md b/docker-cloud/getting-started/deploy-app/4_push_to_cloud_registry.md index 9a7b083bbe..3fa89a0926 100644 --- a/docker-cloud/getting-started/deploy-app/4_push_to_cloud_registry.md +++ b/docker-cloud/getting-started/deploy-app/4_push_to_cloud_registry.md @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/python/4_push_to_cloud_registry/ - /docker-cloud/getting-started/golang/4_push_to_cloud_registry/ title: Push the image to Docker Cloud's registry -notoc: true --- *Skip this step if you don't have Docker Engine installed locally.* @@ -56,6 +55,4 @@ registry. Do this by logging in to [Docker Cloud](https://cloud.docker.com) and clicking **Repositories** in the left navigation. Your image should appear in the repository list. -## What's next? - -[Deploy the app as a Docker Cloud service](5_deploy_the_app_as_a_service.md). +Next: [Deploy the app as a Docker Cloud service](5_deploy_the_app_as_a_service.md). diff --git a/docker-cloud/getting-started/deploy-app/5_deploy_the_app_as_a_service.md b/docker-cloud/getting-started/deploy-app/5_deploy_the_app_as_a_service.md index b9aa73ee6f..09f152bc10 100644 --- a/docker-cloud/getting-started/deploy-app/5_deploy_the_app_as_a_service.md +++ b/docker-cloud/getting-started/deploy-app/5_deploy_the_app_as_a_service.md @@ -70,6 +70,4 @@ Hello World!
Hostname: web-1
Counter: Redis Cache not found, counter dis **CONGRATULATIONS!** You've deployed your first service using Docker Cloud. -## What's Next? - -[Define environment variables](6_define_environment_variables.md). +Next: [Define environment variables](6_define_environment_variables.md). diff --git a/docker-cloud/getting-started/deploy-app/6_define_environment_variables.md b/docker-cloud/getting-started/deploy-app/6_define_environment_variables.md index ea0ff650e0..9b668ef903 100644 --- a/docker-cloud/getting-started/deploy-app/6_define_environment_variables.md +++ b/docker-cloud/getting-started/deploy-app/6_define_environment_variables.md @@ -76,6 +76,4 @@ Look in the quickstart's Dockerfile. ENV NAME World ``` -## What's Next? - Next, we'll try [Scaling the service](7_scale_the_service.md). diff --git a/docker-cloud/getting-started/deploy-app/7_scale_the_service.md b/docker-cloud/getting-started/deploy-app/7_scale_the_service.md index e39ef68d6a..58cc969446 100644 --- a/docker-cloud/getting-started/deploy-app/7_scale_the_service.md +++ b/docker-cloud/getting-started/deploy-app/7_scale_the_service.md @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/python/7_scale_the_service/ - /docker-cloud/getting-started/golang/7_scale_the_service/ title: Scale the service -notoc: true --- Right now, your service is running on a single container. That's great for now. @@ -67,6 +66,4 @@ Hello Python Users!
Hostname: web-2
Counter: Redis Cache not found, coun Congratulations! You now have *two* containers running in your **web** service. -## What's Next? - -[View service logs](8_view_logs.md) +Next: [View service logs](8_view_logs.md) diff --git a/docker-cloud/getting-started/deploy-app/8_view_logs.md b/docker-cloud/getting-started/deploy-app/8_view_logs.md index 70113c6fab..08232c7857 100644 --- a/docker-cloud/getting-started/deploy-app/8_view_logs.md +++ b/docker-cloud/getting-started/deploy-app/8_view_logs.md @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/python/8_view_logs/ - /docker-cloud/getting-started/golang/8_view_logs/ title: View service logs -notoc: true --- Docker Cloud grants you access to the logs your application writes to `stdout`. @@ -13,8 +12,7 @@ An internal service multiplexes all the logs from all the containers of a service into a single stream. To see a service's logs run the `docker-cloud service logs` command with the name of the service. -If we run `docker-cloud service logs web`, you'll see logs for both *web-1* and -*web-2*, like the example below. +If we run `docker-cloud service logs web`, you'll see logs for both *web-1* and *web-2*, like the example below. ```none $ docker-cloud service logs web @@ -26,9 +24,7 @@ $ docker-cloud service logs web [web-2] 2015-01-07T18:48:37.116759956Z 83.50.33.64 - - [07/Jan/2015 18:48:37] "GET / HTTP/1.1" 200 - ``` -To see a specific container's logs, use the `container logs` and the -specific container's name. To learn more about service and container -hostnames, see [Service Discovery](../../apps/service-links.md#using-service-and-container-names-as-hostnames). +To see a specific container's logs, use the `container logs` and the specific container's name. To learn more about service and container hostnames, see [Service Discovery](../../apps/service-links.md#using-service-and-container-names-as-hostnames). ```none $ docker-cloud container logs web-1 @@ -38,10 +34,6 @@ $ docker-cloud container logs web-1 2015-01-07T18:46:07.116759956Z 83.50.33.64 - - [07/Jan/2015 18:46:07] "GET / HTTP/1.1" 200 - ``` -Visit your application using curl or your browser again. Run the `service logs -web` command again, and you will see another log message for your visit. +Visit your application using curl or your browser again. Run the `service logs web` command again, and you will see another log message for your visit. -## What's Next? - -Now, let's explore how to -[Load balance the service](9_load-balance_the_service.md). +Next, let's explore how to [Load balance the service](9_load-balance_the_service.md). 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 8cc5bbb2cf..05572ddfab 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 @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/python/9_load-balance_the_service/ - /docker-cloud/getting-started/golang/9_load-balance_the_service/ title: Load-balance the service -notoc: true --- To load-balance your application, you need to deploy a load-balancing service. @@ -76,6 +75,4 @@ Hello Friendly Users!
Hostname: web-2
Counter: Redis Cache not found, co You can learn more about *dockercloud/haproxy*, our free open source HAProxy image here. -## What's Next? - -[Provision a data backend for your service](10_provision_a_data_backend_for_your_service.md) +Next: [Provision a data backend for your service](10_provision_a_data_backend_for_your_service.md) diff --git a/docker-cloud/getting-started/index.md b/docker-cloud/getting-started/index.md index a8604e3927..f966008b28 100644 --- a/docker-cloud/getting-started/index.md +++ b/docker-cloud/getting-started/index.md @@ -3,7 +3,6 @@ description: 'Getting Started with Docker Cloud: Setting up a node using a hoste cloud provider or your own nodes, deploying a service and clustering.' keywords: one, two, three title: Getting started with Docker Cloud -notoc: true --- If you're completely new to Docker Cloud, start here! @@ -19,4 +18,4 @@ If you're completely new to Docker Cloud, start here! * [Deploy your first node](your_first_node.md) Then, deploy your first nodes, * [Create your first service](your_first_service.md) ...And finish by deploying your first service. -Ready to deploy your first web service? [Deploy a web application in Docker Cloud](deploy-app/index.md) +Ready to deploy your first web service? [Deploy a web application in Docker Cloud](deploy-app/index.md) \ No newline at end of file diff --git a/docker-cloud/getting-started/your_first_node.md b/docker-cloud/getting-started/your_first_node.md index 0c6525502f..6faccd7cf8 100644 --- a/docker-cloud/getting-started/your_first_node.md +++ b/docker-cloud/getting-started/your_first_node.md @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/beginner/your_first_node/ - /docker-cloud/getting-started/beginner/deploy_first_node/ title: Deploy your first node -notoc: true --- In this step you'll create your first node (inside a node cluster) on Docker Cloud. diff --git a/docker-cloud/getting-started/your_first_service.md b/docker-cloud/getting-started/your_first_service.md index b44d6629a9..8ef46f1497 100644 --- a/docker-cloud/getting-started/your_first_service.md +++ b/docker-cloud/getting-started/your_first_service.md @@ -125,6 +125,6 @@ You probably don't need the `hello-world` container to run for very long after y Both terminated Services and Node Clusters remain in the UI for about five minutes. After that time, they no longer appear. -## What's next? +### What's next? Learn more about [scaling your service](../apps/service-scaling.md), or check out some of our other [Deploy an app tutorial](deploy-app/index.md). diff --git a/docker-cloud/images/cloud-clusters.png b/docker-cloud/images/cloud-clusters.png index 7497b598bb..09ac909e81 100644 Binary files a/docker-cloud/images/cloud-clusters.png and b/docker-cloud/images/cloud-clusters.png differ diff --git a/docker-cloud/index.md b/docker-cloud/index.md index b0c413a961..29d5af0bc8 100644 --- a/docker-cloud/index.md +++ b/docker-cloud/index.md @@ -48,20 +48,26 @@ Log in to Docker Cloud using your free [Docker ID](../docker-id/). + + + + + + + + + - - - + + - - + - - + diff --git a/docker-cloud/infrastructure/docker-upgrade.md b/docker-cloud/infrastructure/docker-upgrade.md index 91c1cf8b72..c3bac3eb59 100644 --- a/docker-cloud/infrastructure/docker-upgrade.md +++ b/docker-cloud/infrastructure/docker-upgrade.md @@ -30,6 +30,6 @@ upgrade is automatically restarted, regardless of the restarted. -## Upgrading nodes using the API and CLI +# Upgrading nodes using the API and CLI -See our [API and CLI documentation](/apidocs/docker-cloud.md#upgrade-docker-daemon34) for more information on how to upgrade nodes with our API, SDKs and the CLI. +See our [API and CLI documentation](/apidocs/docker-cloud.md#upgrade-docker-daemon34) for more information on how to upgrade nodes with our API, SDKs and the CLI. \ No newline at end of file diff --git a/docker-cloud/infrastructure/index.md b/docker-cloud/infrastructure/index.md index e79660c4a9..4eb44387cf 100644 --- a/docker-cloud/infrastructure/index.md +++ b/docker-cloud/infrastructure/index.md @@ -2,7 +2,6 @@ description: Manage network in Docker Cloud keywords: nodes, hosts, infrastructure, Cloud title: Docker Cloud infrastructure overview -notoc: true --- Docker Cloud uses an agent and system containers to deploy and manage nodes (hosts) on your behalf. All nodes accessible to your account are connected by an overlay or mesh network, regardless of host or cloud service provider. @@ -71,4 +70,4 @@ The pages in this section explain how to link Docker Cloud to your infrastructur * [Link to Microsoft Azure hosts](link-azure.md) * [Link to Packet hosts](link-packet.md) * [Using Docker Cloud and Packet FAQ](cloud-on-packet.net-faq.md) -* [Link to SoftLayer hosts](link-softlayer.md) +* [Link to SoftLayer hosts](link-softlayer.md) \ No newline at end of file diff --git a/docker-cloud/infrastructure/link-azure.md b/docker-cloud/infrastructure/link-azure.md index f1d9083380..646a9f8fd5 100644 --- a/docker-cloud/infrastructure/link-azure.md +++ b/docker-cloud/infrastructure/link-azure.md @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/beginner/link-azure/ - /docker-cloud/getting-started/link-azure/ title: Link a Microsoft Azure account -notoc: true --- You can link your Microsoft Azure account to your Docker Cloud account to deploy **nodes** and **node clusters** using Docker Cloud's Dashboard, API, or CLI. You must link your Azure account so that Docker Cloud can interact with Azure on your behalf to create and manage your **nodes** (virtual machines). @@ -40,4 +39,4 @@ Go back to Docker Cloud and enter the subscription ID in the **Azure credentials ## What's next? -You're ready to start using Microsoft Azure as the infrastructure provider for Docker Cloud! If you came here from the tutorial, click here to [continue the tutorial and deploy your first node](../getting-started/your_first_node.md). +You're ready to start using Microsoft Azure as the infrastructure provider for Docker Cloud! If you came here from the tutorial, click here to [continue the tutorial and deploy your first node](../getting-started/your_first_node.md). \ No newline at end of file diff --git a/docker-cloud/infrastructure/link-packet.md b/docker-cloud/infrastructure/link-packet.md index 9f8bb54cde..fdec9e39d2 100644 --- a/docker-cloud/infrastructure/link-packet.md +++ b/docker-cloud/infrastructure/link-packet.md @@ -5,7 +5,6 @@ redirect_from: - /docker-cloud/getting-started/beginner/link-packet/ - /docker-cloud/getting-started/link-packet/ title: Link a Packet account -notoc: true --- You can register your [Packet](https://www.packet.net/promo/docker-cloud/) account credentials in your Docker Cloud account to deploy **nodes** and **node clusters** using Docker Cloud's Dashboard, API, and CLI. Your Packet API key is required so Docker Cloud can interact with Packet on your behalf to create and manage your **nodes** (Packet devices). @@ -26,4 +25,4 @@ Go back to the Docker Cloud tab and paste the new API key in the `Authentication ## What's next? -You're ready to start using Packet as the infrastructure provider for Docker Cloud! If you came here from the tutorial, click here to [continue the tutorial and deploy your first node](../getting-started/your_first_node.md). +You're ready to start using Packet as the infrastructure provider for Docker Cloud! If you came here from the tutorial, click here to [continue the tutorial and deploy your first node](../getting-started/your_first_node.md). \ No newline at end of file diff --git a/docker-cloud/orgs.md b/docker-cloud/orgs.md index 8729e6ac49..25a2ffe960 100644 --- a/docker-cloud/orgs.md +++ b/docker-cloud/orgs.md @@ -190,8 +190,6 @@ To remove a team's access to the repository, click the **trashcan** icon next to | Permission level | Access | | ------------- | ------------- | -| **Swarms** (Beta)| | -| Admin | View swarms, manage swarms, add users | | **Repositories** | | | Read | Pull | | Read/Write | Pull, push | diff --git a/docker-cloud/standard/index.md b/docker-cloud/standard/index.md deleted file mode 100644 index 70d914a7eb..0000000000 --- a/docker-cloud/standard/index.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -description: non-Swarm mode Docker Cloud topics -keywords: Docker, cloud -title: Manage Nodes and Apps (Standard Mode) -notoc: true ---- - -These topics cover the traditional, pre-Swarm model for deploying and managing -nodes, services, and applications in Docker Cloud. - -* [Getting started with Docker Cloud](/docker-cloud/getting-started/index.md) - -* [Applications in Docker Cloud](/docker-cloud/apps/index.md) - -* [Cloud stack file YAML reference](/docker-cloud/apps/stack-yaml-reference.md) - -> **Note:** These workflows and references do not apply -to [Swarm Mode](/docker-cloud/cloud-swarm/index.md) Beta.
Tutorial: Getting StartedTutorial: Deploy an App

Start here! Deploy your first node and service in Docker Cloud.

For more advanced beginners: deploy a simple app in Docker Cloud.

Manage Applications Manage Builds and ImagesManage Infrastructure (Standard Mode)

Build and test your code, build Docker images. Link Cloud repositories to your source code provider to automate building images and pushing them to Cloud.

Link to your hosts, upgrade the Docker Cloud agent, and manage container distribution. See the AWS FAQ and Packet.net FAQ

Deploy services, stacks, and apps in Docker Cloud.

Build and test your code, build Docker images.
Manage Swarms (Beta Swarm Mode)Manage Nodes and Apps (Standard Mode)Manage Infrastructure

Provision swarms to popular cloud providers, register existing swarms, and use your Docker ID to authenticate and securely access personal or team swarms.

Deploy and manage nodes, services, and applications in Docker Cloud (Standard Mode).

Learn how to link to your hosts, upgrade the Docker Cloud agent, and manage container distribution. See the AWS FAQ and Packet.net FAQ
API Docs    ●    Frequently Asked Questions    ●    Release Notes