New 6-page "Get Started" (#2296)

* Create index.md * Create part2.md * Create part3.md * Create part4.md * Create part5.md * Rewrite step 2 * Update part2.md * Update part2.md * Update part2.md * Update part2.md * Update part2.md * Update part2.md * Update index.md * Rewrite of part 3 * Tabs-based swarm instructions, pass 1 * Rewrite of parts 3 and 4, tabs implementation * Navigation, rewrites, part 4 completion * Part 5 w/Redis * Part 5, compelte Redis, rename part 6 * TOC/redirect implementation * Update part6.md * Changing links to point to new tutorial * Rewrites and asciinemas * Fix overview * Label diagrams * Fix button * Fix link to where Stacks are covered * Fix typo * s/file/directory * Reformat paragraph * Shorten tabs * Typos * Release DTR 2.2.4, 2.1.6 * Go back to small /edge (#2736) * Go back to small /edge * Update site front page Add info about Editions Reorganize components Update headings * Move logic of fetching content to a script * Add v1.28 API * Add info about versioned API * Fix a few 404s (#2785) * Fix typo * Propose use of another word (#2791) I think that interested is better than invested, in this case. * Update secrets.md (#2780) remove correct secret * Change mount syntax on windows from //c/ to c:\ (#2761) LGTM * Update hackathon.md (#2773) * nodes.md grammar correction (#2802) * Grammar and formatting check (#2797) * Wrong article If the first word starts with a vowel sound you use an. If the first word has a consonant sound use a. * Making the text bold Removing backticks because probably the text needs to be bold and not marked as code. * Update overview.md (#2805) It should say 'predecessors', not 'successors'. Otherwise the sentence and the subsequent example don't make sense. * shrink some big images (#2798) Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> * #2627 (#2804) - Fix right sidebar overflow on rescale * Update hackathon.md * change pre-build to pre_build to remove confusion (#2813) * change pre-build to pre_build to remove confusion * clarify that pre_build hook refers to a file * Update TOC to sentence case (#2790) * add more info about DTR on the overview page (#2794) fix #1904 * Update glossary.yaml (#2807) Fix #2575. * fix imports since docker api pkg migration, fix example repository name to be canonical (#2806) * tweak: code format for filename (#2829) * tweak: code format for filename slight reword, so as to avoid confusion w/filename Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * small changes just to kick build again Signed-off-by: Victoria Bialas <victoria.bialas@docker.com> * Update hackathon.md * fix broken links (#2808) * fix broken link (#2809) * [CONTRIBUTING] update broken link (#2826) * [Debian] add gnupg2 requirement for stretch (#2823) * TOC/redirect implementation * Changing links to point to new tutorial * Rewrites and asciinemas * Fix bad merge * Metadata, formatting * Front page formatting, link instrumentation
docker · Apr 18, 2017 · 8820cfa · 8820cfa
1 parent d5b1b17
commit 8820cfa
Show file tree

Hide file tree

Showing 78 changed files with 1,629 additions and 2,388 deletions.
diff --git a/_config.yml b/_config.yml
@@ -18,10 +18,6 @@ gems:
   - jekyll-seo-tag
   - jekyll-relative-links
 
-webrick:
-  headers:
-    Cache-Control: 600
-
 defaults:
   -
     scope:

diff --git a/_data/advisories.yaml b/_data/advisories.yaml
@@ -15,7 +15,7 @@ texts:
   toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker for Mac](/docker-for-mac/) and [Docker for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible."
   kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker for Mac](/docker-for-mac/) or [Docker for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications."
   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 &#8212; 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."
+  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 &#8212; 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 [Get started with Docker walkthrough](/get-started/)). 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."
 

diff --git a/_data/redirects.csv b/_data/redirects.csv
@@ -1,5 +1,5 @@
 /source,destination
-/engine/quickstart/,/engine/getstarted/
+/engine/quickstart/,/get-started/
 /engine/containers/,/engine/tutorials/
 /win/,/docker-for-windows/
 /mac/,/docker-for-mac/

diff --git a/_data/toc.yaml b/_data/toc.yaml
@@ -129,42 +129,20 @@ guides:
     title: Docker release notes
 - sectiontitle: Get Started
   section:
-  - path: /learn/
-    title: Learn Docker
-  - sectiontitle: Docker basics
+  - sectiontitle: "Get started with Docker"
     section:
-    - path: /engine/getstarted/
-      title: Get started with Docker
-    - path: /engine/getstarted/step_one/
-      title: Install Docker and run hello-world
-    - path: /engine/getstarted/step_two/
-      title: Understand images &amp; containers
-    - path: /engine/getstarted/step_three/
-      title: Find &amp; run the whalesay image
-    - path: /engine/getstarted/step_four/
-      title: Build your own image
-    - path: /engine/getstarted/step_five/
-      title: Create a Docker Hub account &amp; repository
-    - path: /engine/getstarted/step_six/
-      title: Tag, push, &amp; pull your image
-    - path: /engine/getstarted/last_page/
-      title: Learning more
-  - sectiontitle: Define and deploy your app
-    section:
-    - path: /engine/getstarted-voting-app/
-      title: Sample app overview
-    - path: /engine/getstarted-voting-app/node-setup/
-      title: Set up Dockerized machines
-    - path: /engine/getstarted-voting-app/create-swarm/
-      title: Create a swarm
-    - path: /engine/getstarted-voting-app/deploy-app/
-      title: Deploy the app
-    - path: /engine/getstarted-voting-app/test-drive/
-      title: Try out the voting app
-    - path: /engine/getstarted-voting-app/customize-app/
-      title: Customize the app and redeploy
-    - path: /engine/getstarted-voting-app/cleanup/
-      title: Graceful shutdown, reboot, and clean-up
+    - title: "Part 1: Orientation"
+      path: /get-started/
+    - title: "Part 2: Containers"
+      path: /get-started/part2/
+    - title: "Part 3: Services"
+      path: /get-started/part3/
+    - title: "Part 4: Swarms"
+      path: /get-started/part4/
+    - title: "Part 5: Stacks"
+      path: /get-started/part5/
+    - title: "Part 6: Deploy your app"
+      path: /get-started/part6/
   - sectiontitle: Learn by example
     section:
     - path: /engine/tutorials/networkingcontainers/
@@ -175,8 +153,8 @@ guides:
     title: Docker overview
 - sectiontitle: User Guide
   section:
-  - path: /engine/userguide/intro/
-    title: Introduction
+  - path: /engine/userguide/
+    title: Overview
   - sectiontitle: Work with images
     section:
     - path: /engine/userguide/eng-image/dockerfile_best-practices/

diff --git a/_includes/content/docker_elevator_pitch.md b/_includes/content/docker_elevator_pitch.md
diff --git a/_includes/content/typical_docker_workflow.md b/_includes/content/typical_docker_workflow.md
diff --git a/_includes/global-header.html b/_includes/global-header.html
@@ -57,7 +57,7 @@ <h1>{{ site.name }}</h1>
                     <p>Docker provides a way to run applications securely isolated in a container, packaged with all its dependencies and libraries.</p>
                     <ul class="buttons">
                         <li><a class="button transparent-btn" href="/engine/installation/" target="_blank">Get Docker</a></li>
-                        <li> <a class="button secondary-btn" href="/learn/" target="_blank">Get Started</a></li>
+                        <li> <a class="button secondary-btn" href="/get-started/" target="_blank">Get Started</a></li>
                     </ul>
                 </div>
             </div>

diff --git a/compose/bundles.md b/compose/bundles.md
@@ -27,12 +27,11 @@ stack files now are fully supported. A stack file is a particular type of
 [version 3 Compose file](/compose/compose-file/index.md).
 
 If you are just getting started with Docker and want to learn the best way to
-deploy multi-service applications, a good place to start is the [Sample app
-tutorial](/engine/getstarted-voting-app/index.md). This shows you how to define
-a service configuration in a `docker-stack.yml` file, deploy the app, and use
+deploy multi-service applications, a good place to start is the [Get Started
+walkthrough](/get-started/). This shows you how to define
+a service configuration in a Compose file, deploy the app, and use
 the relevant tools and commands.
 
-
 ## Producing a bundle
 
 The easiest way to produce a bundle is to generate it using `docker-compose`
@@ -213,7 +212,7 @@ A service has the following fields:
 
 ## Related topics
 
-* [Sample app tutorial](/engine/getstarted-voting-app/index.md)
+* [Get started walkthrough](/get-started/)
 
 * [docker stack deploy](/engine/reference/commandline/stack_deploy/) command
 

diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
@@ -1532,8 +1532,6 @@ stack.
 - [User guide](/compose/index.md)
 - [Installing Compose](/compose/install/)
 - [Compose file versions and upgrading](compose-versioning.md)
-- [Sample app with swarm mode](/engine/getstarted-voting-app/)
-- [Get started with Django](/compose/django/)
-- [Get started with Rails](/compose/rails/)
-- [Get started with WordPress](/compose/wordpress/)
+- [Get started with Docker](/get-started/)
+- [Samples](/samples/)
 - [Command line reference](/compose/reference/)
diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md
@@ -93,7 +93,7 @@ docker-machine version 0.10.0, build 76ed2a6
     want to keep some images around so that you don't have to pull them again
     from Docker Hub. To remove an image you no longer need, use `docker rmi` followed by an image ID or image name. For example, `docker rmi nginx`.
 
-**Want more example applications?** [Learn Docker](/learn.md) is a great place to start.
+**Want more example applications?** [Get Started](/get-started/) and [Samples](/samples/) are great places to start.
 
 ## Preferences
 
@@ -382,13 +382,7 @@ Check out these [Docker Cloud topics](/docker-cloud/index.md) to learn more:
 
 ## Where to go next
 
-* Try out the tutorials and sample app walkthroughs at [Learn Docker](/learn.md), including:
-
-  *  Learn Docker basics in [Getting Started with Docker](/engine/getstarted/index.md)
-
-  * Learn how to [define and deploy a Docker stack to a swarm](/engine/getstarted-voting-app/index.md)
-  (deploy multiple containers as services and use new
-    Compose Version 3 features)
+* Try out the walkthrough at [Get Started](/get-started/).
 
 * Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example
   walkthroughs and source code.

diff --git a/docker-for-mac/install.md b/docker-for-mac/install.md
@@ -124,7 +124,7 @@ explanation and list of prerequisites.
   > instead of HyperKit.
 
 * **What the install includes**: The installation provides
-  [Docker Engine](/engine/userguide/intro/), Docker CLI client,
+  [Docker Engine](/engine/userguide/), Docker CLI client,
   [Docker Compose](/compose/overview/), and [Docker Machine](/machine/overview/).
 
 ## Install and Run Docker for Mac
@@ -173,4 +173,4 @@ workarounds, how to run and submit diagnostics, and submit issues.
 
 * [Release Notes](release-notes.md) lists component updates, new features, and improvements associated with Stable and Edge releases.
 
-* [Learn Docker](/learn.md) provides general Docker tutorials.
+* [Get Started with Docker](/get-started/) provides a general Docker tutorial.
diff --git a/docker-for-windows/index.md b/docker-for-windows/index.md
@@ -227,7 +227,7 @@ The next few steps take you through some examples. These are just suggestions fo
     want to keep some images around so that you don't have to pull them again
     from Docker Hub. To remove an image you no longer need, use `docker rmi` followed by an image ID or image name. For example, `docker rmi nginx`.
 
-**Want more example applications?** [Learn Docker](/learn.md) is a great place to start.
+**Want more example applications?** [Get Started](/get-started/) and [Samples](/samples) are great places to start.
 
 ## Set up tab completion in PowerShell
 
@@ -700,13 +700,7 @@ If you want to go back to using Docker Toolbox, you have to disable the Hyper-V
 
 ## Where to go next
 
-* Try out the tutorials and sample app walkthroughs at [Learn Docker](/learn.md), including:
-
-  *  Learn Docker basics in [Getting Started with Docker](/engine/getstarted/index.md)
-
-  * Learn how to [define and deploy a Docker stack to a swarm](/engine/getstarted-voting-app/index.md)
-  (deploy multiple containers as services and use new
-    Compose Version 3 features)
+* Try out the walkthrough at [Get Started](/get-started/).
 
 * Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example walkthroughs and source code.
 

diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md
@@ -114,7 +114,7 @@ on a VMWare or Parallels instance, might work, but come with no
 guarantees (i.e., not officially supported). For more information, see
 [Running Docker for Windows in nested virtualization scenarios](troubleshoot.md#running-docker-for-windows-in-nested-virtualization-scenarios)
 <p />
-* **What the Docker for Windows install includes**: The installation provides [Docker Engine](/engine/userguide/intro.md), Docker CLI client, [Docker Compose](/compose/overview.md), and [Docker Machine](/machine/overview.md).
+* **What the Docker for Windows install includes**: The installation provides [Docker Engine](/engine/userguide/), Docker CLI client, [Docker Compose](/compose/overview.md), and [Docker Machine](/machine/overview.md).
 
 ### About Windows containers and Windows Server 2016
 
@@ -165,11 +165,12 @@ Congratulations! You are up and running with Docker for Windows.
 basic Docker command examples, how to get help or give feedback, and
 links to all topics in the Docker for Windows guide.
 
+* [Get started with Docker](/get-started/) teaches you how to define and deploy
+applications with Docker.
+
 * [Troubleshooting](troubleshoot.md) describes common problems,
 workarounds, how to run and submit diagnostics, and submit issues.
 
 * [FAQs](faqs.md) provides answers to frequently asked questions.
 
 * [Release Notes](release-notes.md) lists component updates, new features, and improvements associated with Stable and Edge releases.
-
-* [Learn Docker](/learn.md) provides general Docker tutorials.
diff --git a/docker-hub/index.md b/docker-hub/index.md
@@ -65,9 +65,6 @@ Private repositories do not appear in the repository search results. To see all
 the repositories you can access and their status, view your "Dashboard" page on
 [Docker Hub](https://hub.docker.com).
 
-You can find more information on working with Docker images in the
-[Docker userguide](/engine/getstarted/step_four.md).
-
 ### Use Official Repositories
 
 Docker Hub contains a number of [Official

diff --git a/docker-hub/repos.md b/docker-hub/repos.md
@@ -95,7 +95,6 @@ You can name your local images either when you build it, using
 by re-tagging an existing local image `docker tag <existing-image> <hub-user>/<repo-name>[:<tag>]`,
 or by using `docker commit <exiting-container> <hub-user>/<repo-name>[:<tag>]` to commit
 changes.
-See [Working with Docker images](/engine/getstarted/step_four.md) for a detailed description.
 
 Now you can push this repository to the registry designated by its name or tag.
 

diff --git a/engine/examples/index.md b/engine/examples/index.md
@@ -13,4 +13,4 @@ This section contains the following:
 * [Dockerizing a CouchDB service](couchdb_data_volumes.md)
 * [Dockerizing a Redis service](running_redis_service.md)
 * [Dockerizing an apt-cacher-ng service](apt-cacher-ng.md)
-* [Dockerizing applications: A 'Hello world'](/engine/getstarted/step_one.md)
+* [Get Started](/get-started/)