From 5a58b17bb56af99fd61981573ab025db81d7a7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Sat, 4 Nov 2017 11:45:00 -0700 Subject: [PATCH] Fix image paths --- slides/dockercon.yml | 2 +- slides/intro/Advanced_Dockerfiles.md | 2 +- slides/intro/Ambassadors.md | 4 ++-- slides/intro/Background_Containers.md | 2 +- slides/intro/Building_Images_With_Dockerfiles.md | 2 +- slides/intro/Cmd_And_Entrypoint.md | 2 +- slides/intro/Compose_For_Dev_Stacks.md | 4 ++-- slides/intro/Connecting_Containers_With_Links.md | 2 +- slides/intro/Container_Network_Model.md | 6 +++--- slides/intro/Container_Networking_Basics.md | 4 ++-- slides/intro/Copying_Files_During_Build.md | 2 +- slides/intro/Course_Conclusion.md | 4 ++-- slides/intro/Docker_History.md | 4 ++-- slides/intro/Docker_Overview.md | 14 +++++++------- slides/intro/First_Containers.md | 2 +- slides/intro/Initial_Images.md | 4 ++-- slides/intro/Install_Docker.md | 2 +- slides/intro/Local_Development_Workflow.md | 6 +++--- slides/intro/Naming_And_Inspecting.md | 2 +- slides/intro/Training_Environment.md | 2 +- slides/intro/Working_With_Volumes.md | 2 +- slides/kube.yml | 2 +- slides/lisa.yml | 2 +- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/slides/dockercon.yml b/slides/dockercon.yml index 0fe5d551..eefb1d67 100644 --- a/slides/dockercon.yml +++ b/slides/dockercon.yml @@ -62,7 +62,7 @@ chapters: - This is our collective Docker knowledge: - ![Bell Curve](bell-curve.jpg) + ![Bell Curve](images/bell-curve.jpg) --- diff --git a/slides/intro/Advanced_Dockerfiles.md b/slides/intro/Advanced_Dockerfiles.md index 4c489634..78ce15fd 100644 --- a/slides/intro/Advanced_Dockerfiles.md +++ b/slides/intro/Advanced_Dockerfiles.md @@ -3,7 +3,7 @@ class: title # Advanced Dockerfiles -![construction](Dockerfile_Reference/construction.jpg) +![construction](images/construction.jpg) --- diff --git a/slides/intro/Ambassadors.md b/slides/intro/Ambassadors.md index a3c122dc..e68e3777 100644 --- a/slides/intro/Ambassadors.md +++ b/slides/intro/Ambassadors.md @@ -3,7 +3,7 @@ class: title # Ambassadors -![](Ambassadors/ambassador.jpg) +![](images/ambassador.jpg) --- @@ -40,7 +40,7 @@ ambassador containers. --- -![ambassador](Ambassadors/diagram.png) +![ambassador](images/diagram.png) --- diff --git a/slides/intro/Background_Containers.md b/slides/intro/Background_Containers.md index 605ad81e..b683e5e4 100644 --- a/slides/intro/Background_Containers.md +++ b/slides/intro/Background_Containers.md @@ -3,7 +3,7 @@ class: title # Background Containers -![Background Containers](Background_Containers/background-containers.jpg) +![Background Containers](images/background-containers.jpg) --- diff --git a/slides/intro/Building_Images_With_Dockerfiles.md b/slides/intro/Building_Images_With_Dockerfiles.md index 24c7d071..bd137345 100644 --- a/slides/intro/Building_Images_With_Dockerfiles.md +++ b/slides/intro/Building_Images_With_Dockerfiles.md @@ -3,7 +3,7 @@ class: title # Building Docker images with a Dockerfile -![construction](Building_Images_With_Dockerfiles/construction.jpg) +![construction](images/construction.jpg) --- diff --git a/slides/intro/Cmd_And_Entrypoint.md b/slides/intro/Cmd_And_Entrypoint.md index 1a3c646f..b232e071 100644 --- a/slides/intro/Cmd_And_Entrypoint.md +++ b/slides/intro/Cmd_And_Entrypoint.md @@ -3,7 +3,7 @@ class: title # CMD and ENTRYPOINT -![Container entry doors](Cmd_And_Entrypoint/entrypoint.jpg) +![Container entry doors](images/entrypoint.jpg) --- diff --git a/slides/intro/Compose_For_Dev_Stacks.md b/slides/intro/Compose_For_Dev_Stacks.md index 05a63869..5985f211 100644 --- a/slides/intro/Compose_For_Dev_Stacks.md +++ b/slides/intro/Compose_For_Dev_Stacks.md @@ -52,7 +52,7 @@ Before diving in, let's see a small example of Compose in action. ## Compose in action -![composeup](Compose_For_Dev_Stacks/composeup.gif) +![composeup](images/composeup.gif) --- @@ -96,7 +96,7 @@ including linking the relevant containers together. Verify that the app is running at `http://:8000`. -![composeapp](Compose_For_Dev_Stacks/composeapp.png) +![composeapp](images/composeapp.png) --- diff --git a/slides/intro/Connecting_Containers_With_Links.md b/slides/intro/Connecting_Containers_With_Links.md index 40cd4fc7..774c5a56 100644 --- a/slides/intro/Connecting_Containers_With_Links.md +++ b/slides/intro/Connecting_Containers_With_Links.md @@ -3,7 +3,7 @@ class: title # Connecting Containers With Links -![graph](Connecting_Containers_With_Links/graph.gif) +![graph](images/graph.gif) --- diff --git a/slides/intro/Container_Network_Model.md b/slides/intro/Container_Network_Model.md index 798b0d0b..486cf908 100644 --- a/slides/intro/Container_Network_Model.md +++ b/slides/intro/Container_Network_Model.md @@ -3,7 +3,7 @@ class: title # The Container Network Model -![A denser graph network](Container_Network_Model/complex-network.jpg) +![A denser graph network](images/complex-network.jpg) --- @@ -211,7 +211,7 @@ $ docker ps -l * If we connect to the application now, we will see an error page: .small[ -![Trainingwheels error](Container_Network_Model/trainingwheels-error.png) +![Trainingwheels error](images/trainingwheels-error.png) ] * This is because the Redis service is not running. @@ -242,7 +242,7 @@ $ docker run --net dev --name redis -d redis * If we connect to the application now, we should see that the app is working correctly: .small[ -![Trainingwheels OK](Container_Network_Model/trainingwheels-ok.png) +![Trainingwheels OK](images/trainingwheels-ok.png) ] * When the app tries to resolve `redis`, instead of getting a DNS error, it gets the IP address of our Redis container. diff --git a/slides/intro/Container_Networking_Basics.md b/slides/intro/Container_Networking_Basics.md index b9cfadc7..ad937409 100644 --- a/slides/intro/Container_Networking_Basics.md +++ b/slides/intro/Container_Networking_Basics.md @@ -3,7 +3,7 @@ class: title # Container Networking Basics -![A dense graph network](Container_Networking_Basics/network.jpg) +![A dense graph network](images/network.jpg) --- @@ -69,7 +69,7 @@ But first, let's make sure that everything works properly. Point your browser to the IP address of your Docker host, on the port shown by `docker ps` for container port 80. -![Screenshot](Container_Networking_Basics/web.png) +![Screenshot](images/web.png) --- diff --git a/slides/intro/Copying_Files_During_Build.md b/slides/intro/Copying_Files_During_Build.md index 7df1b42f..60a6101a 100644 --- a/slides/intro/Copying_Files_During_Build.md +++ b/slides/intro/Copying_Files_During_Build.md @@ -3,7 +3,7 @@ class: title # Copying files during the build -![Monks copying books](Copying_Files_During_Build/copy.jpg) +![Monks copying books](images/copy.jpg) --- diff --git a/slides/intro/Course_Conclusion.md b/slides/intro/Course_Conclusion.md index 493bcacb..5866e0fe 100644 --- a/slides/intro/Course_Conclusion.md +++ b/slides/intro/Course_Conclusion.md @@ -2,7 +2,7 @@ class: title # Course Conclusion -![end](Course_Conclusion/end.jpg) +![end](images/end.jpg) --- @@ -29,4 +29,4 @@ class: title Thank You! -.small[http://container.training/] \ No newline at end of file +.small[http://container.training/] diff --git a/slides/intro/Docker_History.md b/slides/intro/Docker_History.md index bb26fdee..b9463e27 100644 --- a/slides/intro/Docker_History.md +++ b/slides/intro/Docker_History.md @@ -20,7 +20,7 @@ class: pic ## The VPS age (until 2007-2008) -![lightcont](About_Docker/lightcont.png) +![lightcont](images/lightcont.png) --- @@ -36,7 +36,7 @@ class: pic ## The PAAS period (2008-2013) -![heroku 2007](About_Docker/heroku-first-homepage.png) +![heroku 2007](images/heroku-first-homepage.png) --- diff --git a/slides/intro/Docker_Overview.md b/slides/intro/Docker_Overview.md index a4904e97..31050666 100644 --- a/slides/intro/Docker_Overview.md +++ b/slides/intro/Docker_Overview.md @@ -58,7 +58,7 @@ class: pic ## The deployment problem -![problem](About_Docker/problem.png) +![problem](images/problem.png) --- @@ -66,7 +66,7 @@ class: pic ## The matrix from hell -![matrix](About_Docker/matrix.png) +![matrix](images/matrix.png) --- @@ -74,7 +74,7 @@ class: pic ## The parallel with the shipping indsutry -![history](About_Docker/shippingindustry.png) +![history](images/shippingindustry.png) --- @@ -82,7 +82,7 @@ class: pic ## Intermodal shipping containers -![shipping](About_Docker/shipping.png) +![shipping](images/shipping.png) --- @@ -90,7 +90,7 @@ class: pic ## A new shipping ecosystem -![shipeco](About_Docker/shipeco.png) +![shipeco](images/shipeco.png) --- @@ -98,7 +98,7 @@ class: pic ## A shipping container system for applications -![shipapp](About_Docker/appcont.png) +![shipapp](images/appcont.png) --- @@ -106,7 +106,7 @@ class: pic ## Eliminate the matrix from hell -![elimatrix](About_Docker/elimatrix.png) +![elimatrix](images/elimatrix.png) --- diff --git a/slides/intro/First_Containers.md b/slides/intro/First_Containers.md index e1285cde..19acff9a 100644 --- a/slides/intro/First_Containers.md +++ b/slides/intro/First_Containers.md @@ -3,7 +3,7 @@ class: title # Our First Containers -![Plastic Containers](First_Containers/firstcontainers.jpg) +![Plastic Containers](images/firstcontainers.jpg) --- diff --git a/slides/intro/Initial_Images.md b/slides/intro/Initial_Images.md index 76508929..dd81a796 100644 --- a/slides/intro/Initial_Images.md +++ b/slides/intro/Initial_Images.md @@ -3,7 +3,7 @@ class: title # Understanding Docker Images -![image](Initial_Images/image.png) +![image](images/image.png) --- @@ -76,7 +76,7 @@ Let's give a couple of metaphors to illustrate those concepts. Images are like templates or stencils that you can create containers from. -![stencil](Initial_Images/stenciling-wall.jpg) +![stencil](images/stenciling-wall.jpg) --- diff --git a/slides/intro/Install_Docker.md b/slides/intro/Install_Docker.md index b8cccb61..e522bf3b 100644 --- a/slides/intro/Install_Docker.md +++ b/slides/intro/Install_Docker.md @@ -4,7 +4,7 @@ class: title # Install Docker -![install](Install_Docker/install.jpg) +![install](images/install.jpg) --- diff --git a/slides/intro/Local_Development_Workflow.md b/slides/intro/Local_Development_Workflow.md index 0f12b17f..6d5c952d 100644 --- a/slides/intro/Local_Development_Workflow.md +++ b/slides/intro/Local_Development_Workflow.md @@ -3,7 +3,7 @@ class: title # Local Development Workflow with Docker -![construction](Local_Development_Workflow/construction.jpg) +![construction](images/construction.jpg) --- @@ -148,7 +148,7 @@ http://:80 We can see our company naming application. -![web application 1](Local_Development_Workflow/webapp1.png) +![web application 1](images/webapp1.png) --- @@ -184,7 +184,7 @@ http://:80 We can see the updated color of our company naming application. -![web application 2](Local_Development_Workflow/webapp2.png) +![web application 2](images/webapp2.png) --- diff --git a/slides/intro/Naming_And_Inspecting.md b/slides/intro/Naming_And_Inspecting.md index b191f5e4..bf604aed 100644 --- a/slides/intro/Naming_And_Inspecting.md +++ b/slides/intro/Naming_And_Inspecting.md @@ -3,7 +3,7 @@ class: title # Naming and inspecting containers -![Markings on container door](Naming_And_Inspecting/containermarkings.jpg) +![Markings on container door](images/containermarkings.jpg) --- diff --git a/slides/intro/Training_Environment.md b/slides/intro/Training_Environment.md index 9faf67d4..4b6407cc 100644 --- a/slides/intro/Training_Environment.md +++ b/slides/intro/Training_Environment.md @@ -2,7 +2,7 @@ class: title # Our training environment -![SSH terminal](Use_Training_VM/ssh.jpg) +![SSH terminal](images/ssh.jpg) --- diff --git a/slides/intro/Working_With_Volumes.md b/slides/intro/Working_With_Volumes.md index 4b2fe29d..5b9283d1 100644 --- a/slides/intro/Working_With_Volumes.md +++ b/slides/intro/Working_With_Volumes.md @@ -3,7 +3,7 @@ class: title # Working with Volumes -![volume](Working_With_Volumes/volume.jpg) +![volume](images/volume.jpg) --- diff --git a/slides/kube.yml b/slides/kube.yml index 6a2cb56e..1c42f651 100644 --- a/slides/kube.yml +++ b/slides/kube.yml @@ -52,7 +52,7 @@ chapters: -- - ![CONTAINERS, I TELL YOU](aj-containers.jpeg) + ![CONTAINERS, I TELL YOU](images/aj-containers.jpeg) -- diff --git a/slides/lisa.yml b/slides/lisa.yml index 8903de08..7191e72b 100644 --- a/slides/lisa.yml +++ b/slides/lisa.yml @@ -59,7 +59,7 @@ chapters: - This is our collective Docker knowledge: - ![Bell Curve](bell-curve.jpg) + ![Bell Curve](images/bell-curve.jpg) ---