diff --git a/docs/tutorial/index.md b/docs/tutorial/index.md index 601b838da..4bab36fc1 100644 --- a/docs/tutorial/index.md +++ b/docs/tutorial/index.md @@ -25,20 +25,19 @@ You'll notice a few flags being used. Here's some more info on them: docker run -dp 80:80 docker/getting-started ``` -## The Docker Dashboard +## The VSCode Extension -Before going too far, we want to highlight the Docker Dashboard, which gives +Before going too far, we want to highlight the Docker VSCode Extension, which gives you a quick view of the containers running on your machine. It gives you quick access to container logs, lets you get a shell inside the container, and lets you easily manage container lifecycle (stop, remove, etc.). -To access the dashboard, follow the instructions for either -[Mac](https://docs.docker.com/docker-for-mac/dashboard/) or -[Windows](https://docs.docker.com/docker-for-windows/dashboard/). If you open the dashboard -now, you will see this tutorial running! The container name (`jolly_bouman` below) is a +To access the extension, follow the instructions +[here](https://code.visualstudio.com/docs/containers/overview). If you open the extension +now, you will see this tutorial running! The container name (`angry_taussig` below) is a randomly created name. So, you'll most likely have a different name. -![Tutorial container running in Docker Dashboard](tutorial-in-dashboard.png) +![Tutorial container running in Docker Extension](vs-tutorial-in-extension.png) ## What is a container? diff --git a/docs/tutorial/multi-container-apps/index.md b/docs/tutorial/multi-container-apps/index.md index 00894a1f3..d0e0b6e7e 100644 --- a/docs/tutorial/multi-container-apps/index.md +++ b/docs/tutorial/multi-container-apps/index.md @@ -216,10 +216,10 @@ With all of that explained, let's start our dev-ready container! Obviously, your table will look different because it has your items. But, you should see them stored there! -If you take a quick look at the Docker Dashboard, you'll see that we have two app containers running. But, there's +If you take a quick look at the Docker extension, you'll see that we have two app containers running. But, there's no real indication that they are grouped together in a single app. We'll see how to make that better shortly! -![Docker Dashboard showing two ungrouped app containers](dashboard-multi-container-app.png) +![Docker Dashboard showing two ungrouped app containers](vs-multi-container-app.png) ## Recap diff --git a/docs/tutorial/multi-container-apps/vs-multi-container-app.png b/docs/tutorial/multi-container-apps/vs-multi-container-app.png new file mode 100644 index 000000000..310dbf947 Binary files /dev/null and b/docs/tutorial/multi-container-apps/vs-multi-container-app.png differ diff --git a/docs/tutorial/our-application/index.md b/docs/tutorial/our-application/index.md index fceca1f2c..179f5cc7a 100644 --- a/docs/tutorial/our-application/index.md +++ b/docs/tutorial/our-application/index.md @@ -97,10 +97,10 @@ command (remember that from earlier?). At this point, you should have a running todo list manager with a few items, all built by you! Now, let's make a few changes and learn about managing our containers. -If you take a quick look at the Docker Dashboard, you should see your two containers running now +If you take a quick look at the VSCode extension, you should see your two containers running now (this tutorial and your freshly launched app container)! -![Docker Dashboard with tutorial and app containers running](dashboard-two-containers.png) +![Docker Dashboard with tutorial and app containers running](vs-two-containers.png) ## Recap diff --git a/docs/tutorial/our-application/vs-two-containers.png b/docs/tutorial/our-application/vs-two-containers.png new file mode 100644 index 000000000..abae46185 Binary files /dev/null and b/docs/tutorial/our-application/vs-two-containers.png differ diff --git a/docs/tutorial/updating-our-app/index.md b/docs/tutorial/updating-our-app/index.md index 92f752e23..1a5dfd7ec 100644 --- a/docs/tutorial/updating-our-app/index.md +++ b/docs/tutorial/updating-our-app/index.md @@ -74,17 +74,16 @@ ways that we can remove the old container. Feel free to choose the path that you ### Removing a container using the Docker Dashboard -If you open the Docker dashboard, you can remove a container with two clicks! It's certainly +If you open the VSCode Extension, you can remove a container with two clicks! It's certainly much easier than having to look up the container ID and remove it. -1. With the dashboard opened, hover over the app container and you'll see a collection of action - buttons appear on the right. +1. With the extension opened, navigate to the container and right click. -1. Click on the trash can icon to delete the container. +1. Click on the remove container option 1. Confirm the removal and you're done! -![Docker Dashboard - removing a container](dashboard-removing-container.png) +![Docker Dashboard - removing a container](vs-removing-container.png) ### Starting our updated app container diff --git a/docs/tutorial/updating-our-app/vs-removing-container.png b/docs/tutorial/updating-our-app/vs-removing-container.png new file mode 100644 index 000000000..4a23aeaa7 Binary files /dev/null and b/docs/tutorial/updating-our-app/vs-removing-container.png differ diff --git a/docs/tutorial/using-docker-compose/index.md b/docs/tutorial/using-docker-compose/index.md index 672d08ff8..965e4ee8a 100644 --- a/docs/tutorial/using-docker-compose/index.md +++ b/docs/tutorial/using-docker-compose/index.md @@ -293,19 +293,15 @@ Now that we have our `docker-compose.yml` file, we can start it up! 1. At this point, you should be able to open your app and see it running. And hey! We're down to a single command! -## Seeing our App Stack in Docker Dashboard +## Seeing our App Stack in the Docker Extension -If we look at the Docker Dashboard, we'll see that there is a group named **app**. This is the "project name" from Docker -Compose and used to group the containers together. By default, the project name is simply the name of the directory that the -`docker-compose.yml` was located in. +If we look at the Docker Extension, we can changing our grouping options using the 'cog' and 'group by'. In this instance we want to see containers sharing a network. -![Docker Dashboard with app project](dashboard-app-project-collapsed.png) +![VS Extension with network](vs-app-project-collapsed.png) -If you twirl down the app, you will see the two containers we defined in the compose file. The names are also a little -more descriptive, as they follow the pattern of `__`. So, it's very easy to -quickly see what container is our app and which container is the mysql database. +If you twirl down the network, you will see the two containers we defined in the compose file. -![Docker Dashboard with app project expanded](dashboard-app-project-expanded.png) +![VS Extension with app network expanded](vs-app-project-expanded.png) ## Tearing it All Down diff --git a/docs/tutorial/using-docker-compose/vs-app-project-collapsed.png b/docs/tutorial/using-docker-compose/vs-app-project-collapsed.png new file mode 100644 index 000000000..842ac23a7 Binary files /dev/null and b/docs/tutorial/using-docker-compose/vs-app-project-collapsed.png differ diff --git a/docs/tutorial/using-docker-compose/vs-app-project-expanded.png b/docs/tutorial/using-docker-compose/vs-app-project-expanded.png new file mode 100644 index 000000000..25211d876 Binary files /dev/null and b/docs/tutorial/using-docker-compose/vs-app-project-expanded.png differ diff --git a/docs/tutorial/vs-tutorial-in-extension.png b/docs/tutorial/vs-tutorial-in-extension.png new file mode 100644 index 000000000..2ae3090d9 Binary files /dev/null and b/docs/tutorial/vs-tutorial-in-extension.png differ