Skip to content

Commit

Permalink
Merge pull request #24 from crd/recommend_slide_changes
Browse files Browse the repository at this point in the history
Recommended slide changes
  • Loading branch information
Jérôme Petazzoni committed Jun 3, 2016
2 parents 313d46a + 6649e97 commit d31f098
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions www/htdocs/index.html
Expand Up @@ -204,7 +204,7 @@
- on Linux, OS X, FreeBSD... you are probably all set

- on Windows, get [putty](http://www.putty.org/),
[Git BASH](https://msysgit.github.io/), or
[Git BASH](https://git-for-windows.github.io/), or
[MobaXterm](http://mobaxterm.mobatek.net/)

- Basic Docker knowledge
Expand Down Expand Up @@ -1344,7 +1344,7 @@

- static, through command-line or file
<br/>(great for testing, or for private subnets, see [this article](
https://medium.com/on-docker/docker-swarm-flat-file-engine-discovery-2b23516c71d4#.6vp94h5wn)
https://medium.com/on-docker/docker-swarm-flat-file-engine-discovery-2b23516c71d4#.6vp94h5wn))

- external, token-based
<br/>(dynamic; nothing to operate; relies on external service operated by Docker Inc.)
Expand Down Expand Up @@ -1770,7 +1770,7 @@
]
---

## Why zero node?
## Why zero nodes?

- We haven't started Consul yet

Expand Down Expand Up @@ -3019,7 +3019,7 @@

- So the name `rng` should resolve to the load balancer

- What do‽
- What should we do‽

---

Expand Down Expand Up @@ -3197,7 +3197,7 @@

## Automating the process

- Nobody loves artisan YAML handy craft
- Nobody loves artisan YAML handicraft

- This can be scripted very easily

Expand Down Expand Up @@ -4315,8 +4315,8 @@
- You can issue API requests to any manager:
<br/>if you talk to a secondary, it forwards to the primary

.warning[There is currently a bug when
the Consul cluster itself has a leader election;
.warning[Until recently there was a bug when
the Consul cluster itself had a leader election;
<br/>see [docker/swarm#1782](https://github.com/docker/swarm/issues/1782).]

---
Expand Down Expand Up @@ -4608,7 +4608,7 @@

## App deployment

- We saw how to transform a Compose file into a series of build artefacts
- We saw how to transform a Compose file into a series of build artifacts

- using S3 or another object store is trivial

Expand Down

0 comments on commit d31f098

Please sign in to comment.