diff --git a/get-started/02_our_app.md b/get-started/02_our_app.md index 59e0967140..da96971730 100644 --- a/get-started/02_our_app.md +++ b/get-started/02_our_app.md @@ -1,7 +1,9 @@ --- title: "Our Application" keywords: get started, setup, orientation, quickstart, intro, concepts, containers, docker desktop -description: overview of our simple applicaiton for learning docker +redirect_from: +- /get-started/part2/ +description: overview of our simple application for learning docker --- diff --git a/get-started/04_sharing_app.md b/get-started/04_sharing_app.md index 4512c61156..dab29c6963 100644 --- a/get-started/04_sharing_app.md +++ b/get-started/04_sharing_app.md @@ -1,6 +1,8 @@ --- title: "Sharing Our Application" keywords: get started, setup, orientation, quickstart, intro, concepts, containers, docker desktop, docker hub, sharing +redirect_from: +- /get-started/part3/ description: Sharing our image we built for our example application so we can run it else where and other developers can use it --- diff --git a/get-started/kube-deploy.md b/get-started/kube-deploy.md index 4c5c9073b6..d39a58310b 100644 --- a/get-started/kube-deploy.md +++ b/get-started/kube-deploy.md @@ -7,7 +7,7 @@ description: Learn how to describe and deploy a simple application on Kubernetes ## Prerequisites - Download and install Docker Desktop as described in [Orientation and setup](index.md). -- Work through containerizing an application in [Part 2](part2.md). +- Work through containerizing an application in [Part 2](02_our_app.md). - Make sure that Kubernetes is enabled on your Docker Desktop: - **Mac**: Click the Docker icon in your menu bar, navigate to **Preferences** and make sure there's a green light beside 'Kubernetes'. - **Windows**: Click the Docker icon in the system tray and navigate to **Settings** and make sure there's a green light beside 'Kubernetes'. @@ -111,7 +111,7 @@ All containers in Kubernetes are scheduled as _pods_, which are groups of co-loc In addition to the default `kubernetes` service, we see our `bb-entrypoint` service, accepting traffic on port 30001/TCP. -3. Open a browser and visit your bulletin board at `localhost:30001`; you should see your bulletin board, the same as when we ran it as a stand-alone container in [Part 2](part2.md) of the Quickstart tutorial. +3. Open a browser and visit your bulletin board at `localhost:30001`; you should see your bulletin board, the same as when we ran it as a stand-alone container in [Part 2](02_our_app.md) of the Quickstart tutorial. 4. Once satisfied, tear down your application: diff --git a/get-started/nav.html b/get-started/nav.html index 517ddb2817..fc78213b28 100644 --- a/get-started/nav.html +++ b/get-started/nav.html @@ -1,5 +1,5 @@ diff --git a/get-started/swarm-deploy.md b/get-started/swarm-deploy.md index fd59e23ef8..fb7cad3756 100644 --- a/get-started/swarm-deploy.md +++ b/get-started/swarm-deploy.md @@ -9,7 +9,7 @@ redirect_from: ## Prerequisites - Download and install Docker Desktop as described in [Orientation and setup](index.md). -- Work through containerizing an application in [Part 2](part2.md). +- Work through containerizing an application in [Part 2](02_our_app.md). - Make sure that Swarm is enabled on your Docker Desktop by typing `docker system info`, and looking for a message `Swarm: active` (you might have to scroll up a little). If Swarm isn't running, simply type `docker swarm init` in a shell prompt to set it up. @@ -36,7 +36,7 @@ services: - "8000:8080" ``` -In this Swarm YAML file, we have just one object: a `service`, describing a scalable group of identical containers. In this case, you'll get just one container (the default), and that container will be based on your `bulletinboard:1.0` image created in [Part 2](part2.md) of the Quickstart tutorial. In addition, We've asked Swarm to forward all traffic arriving at port 8000 on our development machine to port 8080 inside our bulletin board container. +In this Swarm YAML file, we have just one object: a `service`, describing a scalable group of identical containers. In this case, you'll get just one container (the default), and that container will be based on your `bulletinboard:1.0` image created in [Part 2](02_our_app.md) of the Quickstart tutorial. In addition, We've asked Swarm to forward all traffic arriving at port 8000 on our development machine to port 8080 inside our bulletin board container. > **Kubernetes Services and Swarm Services are very different!** Despite the similar name, the two orchestrators mean very different things by the term 'service'. In Swarm, a service provides both scheduling _and_ networking facilities, creating containers and providing tools for routing traffic to them. In Kubernetes, scheduling and networking are handled separately: _deployments_ (or other controllers) handle the scheduling of containers as pods, while _services_ are responsible only for adding networking features to those pods.