diff --git a/slides/containers/Container_Network_Model.md b/slides/containers/Container_Network_Model.md index 9e13700b..8bcf72cf 100644 --- a/slides/containers/Container_Network_Model.md +++ b/slides/containers/Container_Network_Model.md @@ -107,9 +107,17 @@ class: pic class: pic +## Two containers on a single Docker network + +![bridge2](images/bridge2.png) + +--- + +class: pic + ## Two containers on two Docker networks -![bridge3](images/bridge2.png) +![bridge3](images/bridge3.png) --- diff --git a/slides/containers/Local_Development_Workflow.md b/slides/containers/Local_Development_Workflow.md index 206e8e3b..dee592ee 100644 --- a/slides/containers/Local_Development_Workflow.md +++ b/slides/containers/Local_Development_Workflow.md @@ -309,54 +309,6 @@ and *canary deployments*. --- -## Improving the workflow - -The workflow that we showed is nice, but it requires us to: - -* keep track of all the `docker run` flags required to run the container, - -* inspect the `Dockerfile` to know which path(s) to mount, - -* write scripts to hide that complexity. - -There has to be a better way! - ---- - -## Docker Compose to the rescue - -* Docker Compose allows us to "encode" `docker run` parameters in a YAML file. - -* Here is the `docker-compose.yml` file that we can use for our "namer" app: - - ```yaml - www: - build: . - volumes: - - .:/src - ports: - - 80:9292 - ``` - -* Try it: - ```bash - $ docker-compose up -d - ``` - ---- - -## Working with Docker Compose - -* When you see a `docker-compose.yml` file, you can use `docker-compose up`. - -* It can build images and run them with the required parameters. - -* Compose can also deal with complex, multi-container apps. - - (More on this later!) - ---- - ## Recap of the development workflow 1. Write a Dockerfile to build an image containing our development environment. diff --git a/slides/images/bridge1.png b/slides/images/bridge1.png old mode 100644 new mode 100755 index 70b3128b..db19b009 Binary files a/slides/images/bridge1.png and b/slides/images/bridge1.png differ diff --git a/slides/images/bridge2.png b/slides/images/bridge2.png old mode 100644 new mode 100755 index 9d44ab62..5a3d0105 Binary files a/slides/images/bridge2.png and b/slides/images/bridge2.png differ diff --git a/slides/images/bridge3.png b/slides/images/bridge3.png new file mode 100755 index 00000000..ed5eb918 Binary files /dev/null and b/slides/images/bridge3.png differ diff --git a/slides/workshop.css b/slides/workshop.css index 88f707c3..f3047404 100644 --- a/slides/workshop.css +++ b/slides/workshop.css @@ -110,7 +110,7 @@ div.pic img { display: block; margin: auto; max-width: 1210px; - max-height: 681px; + max-height: 550px; } div.pic h1, div.pic h2, div.title h1, div.title h2 { text-align: center;