From c93edceffe3adc67da4359cf8e0cbb583d8a89dd Mon Sep 17 00:00:00 2001 From: Bret Fisher Date: Wed, 2 May 2018 23:25:12 -0400 Subject: [PATCH 1/2] more new features for swarm --- slides/swarm/versions.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/slides/swarm/versions.md b/slides/swarm/versions.md index f247c193..bb5e9802 100644 --- a/slides/swarm/versions.md +++ b/slides/swarm/versions.md @@ -89,8 +89,11 @@ class: pic | 2016 | 1.12 | Swarm mode, routing mesh, encrypted networking, healthchecks | 2017 | 1.13 | Stacks, attachable overlays, image squash and compress | 2017 | 1.13 | Windows Server 2016 Swarm mode -| 2017 | 17.03 | Secrets +| 2017 | 17.03 | Secrets, encrypted Raft | 2017 | 17.04 | Update rollback, placement preferences (soft constraints) -| 2017 | 17.05 | Multi-stage image builds, service logs -| 2017 | 17.06 | Swarm configs, node/service events +| 2017 | 17.06 | Swarm configs, node/service events, multi-stage build, service logs | 2017 | 17.06 | Windows Server 2016 Swarm overlay networks, secrets +| 2017 | 17.09 | ADD/COPY chown, start\_period, stop-signal, overlay2 default +| 2017 | 17.12 | containerd, Hyper-V isolation, Windows routing mesh +| 2018 | 18.03 | Templates for secrets/configs, multi-yaml stacks, LCOW +| 2018 | 18.03 | Stack deploy to Kubernetes, docker trust, tmpfs, manifest cli From 999359e81adc3c1247354d7f9774a37075aaf590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Petazzoni?= Date: Sat, 5 May 2018 05:45:40 -0500 Subject: [PATCH 2/2] Update versions.md --- slides/swarm/versions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/swarm/versions.md b/slides/swarm/versions.md index bb5e9802..b591d4a7 100644 --- a/slides/swarm/versions.md +++ b/slides/swarm/versions.md @@ -96,4 +96,4 @@ class: pic | 2017 | 17.09 | ADD/COPY chown, start\_period, stop-signal, overlay2 default | 2017 | 17.12 | containerd, Hyper-V isolation, Windows routing mesh | 2018 | 18.03 | Templates for secrets/configs, multi-yaml stacks, LCOW -| 2018 | 18.03 | Stack deploy to Kubernetes, docker trust, tmpfs, manifest cli +| 2018 | 18.03 | Stack deploy to Kubernetes, `docker trust`, tmpfs, manifest CLI