diff --git a/slides/images/lifecycle.png b/slides/docker-ce-ee-lifecycle.png similarity index 100% rename from slides/images/lifecycle.png rename to slides/docker-ce-ee-lifecycle.png diff --git a/slides/images/diagram.odg b/slides/images/ambassador-diagram.odg similarity index 100% rename from slides/images/diagram.odg rename to slides/images/ambassador-diagram.odg diff --git a/slides/images/diagram.png b/slides/images/ambassador-diagram.png similarity index 100% rename from slides/images/diagram.png rename to slides/images/ambassador-diagram.png diff --git a/slides/images/lightcont.png b/slides/images/containers-as-lightweight-vms.png similarity index 100% rename from slides/images/lightcont.png rename to slides/images/containers-as-lightweight-vms.png diff --git a/slides/images/thanks-weave.png b/slides/images/k8s-arch3-thanks-weave.png similarity index 100% rename from slides/images/thanks-weave.png rename to slides/images/k8s-arch3-thanks-weave.png diff --git a/slides/images/shipeco.png b/slides/images/shipping-indsutry-results.png similarity index 100% rename from slides/images/shipeco.png rename to slides/images/shipping-indsutry-results.png diff --git a/slides/images/shippingindustry.png b/slides/images/shipping-industry-problem.png similarity index 100% rename from slides/images/shippingindustry.png rename to slides/images/shipping-industry-problem.png diff --git a/slides/images/shipping.png b/slides/images/shipping-industry-solution.png similarity index 100% rename from slides/images/shipping.png rename to slides/images/shipping-industry-solution.png diff --git a/slides/images/matrix.png b/slides/images/shipping-matrix-from-hell.png similarity index 100% rename from slides/images/matrix.png rename to slides/images/shipping-matrix-from-hell.png diff --git a/slides/images/elimatrix.png b/slides/images/shipping-matrix-solved.png similarity index 100% rename from slides/images/elimatrix.png rename to slides/images/shipping-matrix-solved.png diff --git a/slides/images/problem.png b/slides/images/shipping-software-problem.png similarity index 100% rename from slides/images/problem.png rename to slides/images/shipping-software-problem.png diff --git a/slides/images/appcont.png b/slides/images/shipping-software-solution.png similarity index 100% rename from slides/images/appcont.png rename to slides/images/shipping-software-solution.png diff --git a/slides/images/webapp1.png b/slides/images/webapp-in-blue.png similarity index 100% rename from slides/images/webapp1.png rename to slides/images/webapp-in-blue.png diff --git a/slides/images/webapp2.png b/slides/images/webapp-in-red.png similarity index 100% rename from slides/images/webapp2.png rename to slides/images/webapp-in-red.png diff --git a/slides/images/web.png b/slides/images/welcome-to-nginx.png similarity index 100% rename from slides/images/web.png rename to slides/images/welcome-to-nginx.png diff --git a/slides/intro/Ambassadors.md b/slides/intro/Ambassadors.md index 3dee5e72..136d7453 100644 --- a/slides/intro/Ambassadors.md +++ b/slides/intro/Ambassadors.md @@ -3,7 +3,7 @@ class: title # Ambassadors -![](images/title-ambassador.jpg) +![Two serious-looking persons shaking hands](images/title-ambassador.jpg) --- @@ -40,7 +40,7 @@ ambassador containers. --- -![ambassador](images/diagram.png) +![ambassador](images/ambassador-diagram.png) --- diff --git a/slides/intro/Container_Networking_Basics.md b/slides/intro/Container_Networking_Basics.md index bdc848c0..6b4e0c4b 100644 --- a/slides/intro/Container_Networking_Basics.md +++ b/slides/intro/Container_Networking_Basics.md @@ -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](images/web.png) +![Screenshot](images/welcome-to-nginx.png) --- diff --git a/slides/intro/Docker_History.md b/slides/intro/Docker_History.md index b9463e27..299042c6 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](images/lightcont.png) +![lightcont](images/containers-as-lightweight-vms.png) --- diff --git a/slides/intro/Docker_Overview.md b/slides/intro/Docker_Overview.md index 845bec81..95504618 100644 --- a/slides/intro/Docker_Overview.md +++ b/slides/intro/Docker_Overview.md @@ -58,7 +58,7 @@ class: pic ## The deployment problem -![problem](images/problem.png) +![problem](images/shipping-software-problem.png) --- @@ -66,7 +66,7 @@ class: pic ## The matrix from hell -![matrix](images/matrix.png) +![matrix](images/shipping-matrix-from-hell.png) --- @@ -74,7 +74,7 @@ class: pic ## The parallel with the shipping indsutry -![history](images/shippingindustry.png) +![history](images/shipping-industry-problem.png) --- @@ -82,7 +82,7 @@ class: pic ## Intermodal shipping containers -![shipping](images/shipping.png) +![shipping](images/shipping-industry-solution.png) --- @@ -90,7 +90,7 @@ class: pic ## A new shipping ecosystem -![shipeco](images/shipeco.png) +![shipeco](images/shipping-indsutry-results.png) --- @@ -98,7 +98,7 @@ class: pic ## A shipping container system for applications -![shipapp](images/appcont.png) +![shipapp](images/shipping-software-solution.png) --- @@ -106,7 +106,7 @@ class: pic ## Eliminate the matrix from hell -![elimatrix](images/elimatrix.png) +![elimatrix](images/shipping-matrix-solved.png) --- diff --git a/slides/intro/Local_Development_Workflow.md b/slides/intro/Local_Development_Workflow.md index 0b314636..c6d10738 100644 --- a/slides/intro/Local_Development_Workflow.md +++ b/slides/intro/Local_Development_Workflow.md @@ -148,7 +148,7 @@ http://:80 We can see our company naming application. -![web application 1](images/webapp1.png) +![web application 1](images/webapp-in-blue.png) --- @@ -184,7 +184,7 @@ http://:80 We can see the updated color of our company naming application. -![web application 2](images/webapp2.png) +![web application 2](images/webapp-in-red.png) --- diff --git a/slides/kube/concepts-k8s.md b/slides/kube/concepts-k8s.md index 067c3165..9fc4f626 100644 --- a/slides/kube/concepts-k8s.md +++ b/slides/kube/concepts-k8s.md @@ -208,6 +208,6 @@ Yes! class: pic -![Node, pod, container](images/thanks-weave.png) +![Node, pod, container](images/k8s-arch3-thanks-weave.png) (Diagram courtesy of Weave Works, used with permission.) diff --git a/slides/swarm/versions.md b/slides/swarm/versions.md index 694e15e8..359708a4 100644 --- a/slides/swarm/versions.md +++ b/slides/swarm/versions.md @@ -75,7 +75,7 @@ class: extra-details class: pic -![Docker CE/EE release cycle](images/lifecycle.png) +![Docker CE/EE release cycle](docker-ce-ee-lifecycle.png) ---