From 8045215c63e5401366a567083bc713722e747838 Mon Sep 17 00:00:00 2001 From: djalal Date: Wed, 13 Feb 2019 10:58:59 +0100 Subject: [PATCH 1/7] squashing couple of typos --- slides/containers/Orchestration_Overview.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/containers/Orchestration_Overview.md b/slides/containers/Orchestration_Overview.md index f223e80f..283ff5d6 100644 --- a/slides/containers/Orchestration_Overview.md +++ b/slides/containers/Orchestration_Overview.md @@ -155,7 +155,7 @@ processes or data flows are given access to system resources.* The scheduler is concerned mainly with: -- throughput (total amount or work done per time unit); +- throughput (total amount of work done per time unit); - turnaround time (between submission and completion); - response time (between submission and start); - waiting time (between job readiness and execution); @@ -390,7 +390,7 @@ It depends on: (Marathon = long running processes; Chronos = run at intervals; ...) -- Commercial offering through DC/OS my Mesosphere. +- Commercial offering through DC/OS by Mesosphere. --- From 8d1737c2b31201b3f6482781f4e646d9eacc4a41 Mon Sep 17 00:00:00 2001 From: djalal Date: Wed, 13 Feb 2019 11:07:00 +0100 Subject: [PATCH 2/7] reflect latest stable versions ATTN: coupled with YAML files in "prepare-vms/settings" folder --- slides/swarm/versions.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/slides/swarm/versions.md b/slides/swarm/versions.md index 8b6603ef..d8d74889 100644 --- a/slides/swarm/versions.md +++ b/slides/swarm/versions.md @@ -1,8 +1,8 @@ ## Brand new versions! -- Engine 18.06 -- Compose 1.22 -- Machine 0.15 +- Engine 18.09 +- Compose 1.23 +- Machine 0.16 .exercise[ @@ -17,7 +17,7 @@ --- -## Wait, what, 17.12 ?!? +## Wait, what, 18.09 ?!? -- From 42c1a93d5ff5bba134f784b558280d16c67e9ae2 Mon Sep 17 00:00:00 2001 From: djalal Date: Wed, 13 Feb 2019 11:10:03 +0100 Subject: [PATCH 3/7] reflect official product name --- slides/containers/Installing_Docker.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/containers/Installing_Docker.md b/slides/containers/Installing_Docker.md index ced137d4..14f42c2c 100644 --- a/slides/containers/Installing_Docker.md +++ b/slides/containers/Installing_Docker.md @@ -82,11 +82,11 @@ class: extra-details ## Installing Docker on macOS and Windows -* On macOS, the recommended method is to use Docker for Mac: +* On macOS, the recommended method is to use Docker Desktop for Mac: https://docs.docker.com/docker-for-mac/install/ -* On Windows 10 Pro, Enterprise, and Education, you can use Docker for Windows: +* On Windows 10 Pro, Enterprise, and Education, you can use Docker Desktop for Windows: https://docs.docker.com/docker-for-windows/install/ @@ -100,7 +100,7 @@ class: extra-details --- -## Docker for Mac and Docker for Windows +## Docker Desktop for Mac and Docker Desktop for Windows * Special Docker Editions that integrate well with their respective host OS From 8325dcc6a0abafc48e716ebc0d4eccb9b5f278e3 Mon Sep 17 00:00:00 2001 From: djalal Date: Wed, 13 Feb 2019 11:13:06 +0100 Subject: [PATCH 4/7] clarify product name --- slides/shared/sampleapp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/shared/sampleapp.md b/slides/shared/sampleapp.md index 45cdaaa0..10cf87ab 100644 --- a/slides/shared/sampleapp.md +++ b/slides/shared/sampleapp.md @@ -278,7 +278,7 @@ Docker Engine is running on a different machine. This can be the case if: When you run DockerCoins in development mode, the web UI static files are mapped to the container using a volume. Alas, volumes can only -work on a local environment, or when using Docker4Mac or Docker4Windows. +work on a local environment, or when using Docker Desktop for Mac or Windows. How to fix this? From 662b3a47a0c60c5b2a0bfd7c5feff3a7951af617 Mon Sep 17 00:00:00 2001 From: djalal Date: Wed, 13 Feb 2019 11:14:31 +0100 Subject: [PATCH 5/7] use official URL for compose upgrade --- slides/swarm/stacks.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/swarm/stacks.md b/slides/swarm/stacks.md index fa873532..bd6049bb 100644 --- a/slides/swarm/stacks.md +++ b/slides/swarm/stacks.md @@ -48,7 +48,7 @@ class: btp-manual - Resource limits are moved to this `deploy` section -- See [here](https://github.com/aanand/docker.github.io/blob/8524552f99e5b58452fcb1403e1c273385988b71/compose/compose-file.md#upgrading) for the complete list of changes +- See [here](https://github.com/docker/docker.github.io/blob/master/compose/compose-file/compose-versioning.md#upgrading) for the complete list of changes - Supersedes *Distributed Application Bundles* @@ -149,7 +149,7 @@ Our registry is not *exactly* identical to the one deployed with `docker service - Each stack gets its own overlay network -- Services of the task are connected to this network +- Services of the stack are connected to this network
(unless specified differently in the Compose file) - Services get network aliases matching their name in the Compose file From 4f2ecb0f4ae050da4720cf1a875ff55a8d0b907f Mon Sep 17 00:00:00 2001 From: djalal Date: Wed, 13 Feb 2019 11:16:42 +0100 Subject: [PATCH 6/7] "sall" typo (sic) --- slides/swarm/healthchecks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/swarm/healthchecks.md b/slides/swarm/healthchecks.md index 01e45226..c13570f1 100644 --- a/slides/swarm/healthchecks.md +++ b/slides/swarm/healthchecks.md @@ -65,7 +65,7 @@ name: healthchecks Here is a comprehensive example using the CLI: -.sall[ +.small[ ```bash docker service update \ --update-delay 5s \ From b8f8ffa07d48c551ae06b8ae4ca24069e733d1a4 Mon Sep 17 00:00:00 2001 From: djalal Date: Wed, 13 Feb 2019 11:19:09 +0100 Subject: [PATCH 7/7] tie pow 0:) --- slides/swarm/metrics.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slides/swarm/metrics.md b/slides/swarm/metrics.md index 1999117c..120feb85 100644 --- a/slides/swarm/metrics.md +++ b/slides/swarm/metrics.md @@ -454,7 +454,7 @@ class: snap .exercise[ -- Run the following command *on every node:* +- Run the following command *on every node*: ```bash snapd -t 0 -l 1 --tribe --tribe-seed node1:6000 ``` @@ -636,7 +636,7 @@ class: snap ] Note: this will allow any node to publish metrics data to `localhost:8086`, -and it will allows us to access the admin interface by connecting to any node +and it will allow us to access the admin interface by connecting to any node on port 8083. .warning[Make sure to use InfluxDB 0.13; a few things changed in 1.0