Skip to content

Commit 1242432

Browse files
author
Peter Schiffer
committed
Cosmetics
1 parent effa562 commit 1242432

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

index.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3322,7 +3322,7 @@ <h2>Thank you!</h2>
33223322
<section id="session-6">
33233323
<h2>Session 6</h2>
33243324
<ul>
3325-
<li><a href="#/docker-features-per-release">Features in docker releases</a></li>
3325+
<li><a href="#/docker-features-per-release">Features in Docker releases</a></li>
33263326
<li><a href="#/other-container-technologies">Other container technologies</a></li>
33273327
</ul>
33283328
</section>
@@ -3345,9 +3345,9 @@ <h2>docker-1.10 — /var/lib/docker revamp</h2>
33453345
<section>
33463346
<h2>docker-1.10 — seccomp</h2>
33473347
<ul>
3348-
<li>in-place by default</li>
3349-
<li>blocks syscalls like <code>clone, clock_*, *_module, keyctl, ptrace, reboot, mount, ...</code></li>
3350-
<li>you can create your own profiles</li>
3348+
<li>In-place by default</li>
3349+
<li>Blocks syscalls like <code>clone, clock_*, *_module, keyctl, ptrace, reboot, mount, ...</code></li>
3350+
<li>You can create your own profiles</li>
33513351
</ul>
33523352
<pre><code data-trim data-noescape>
33533353
$ sudo docker run --security-opt seccomp=path/to/profile.json
@@ -3416,7 +3416,7 @@ <h2>docker-1.10 — user namespaces II</h2>
34163416

34173417
<section>
34183418
<h2>docker-1.11 — architecture change</h2>
3419-
<p>docker is now made of 4 binaries:</p>
3419+
<p>Docker is now made of 4 binaries:</p>
34203420
<ul>
34213421
<li><code>docker</code></li>
34223422
<li><code>docker-containerd</code></li>
@@ -3439,10 +3439,10 @@ <h2>docker-1.12</h2>
34393439
<ul>
34403440
<li><code>swarm</code> mode</li>
34413441
<li><code>stack</code> and <code>deploy</code>: multi-container applications</li>
3442-
<li>new <code>HEALTHCHECK</code> instruction</li>
3442+
<li>New <code>HEALTHCHECK</code> instruction</li>
34433443
<li><code>docker</code> client binary and <code>dockerd</code> daemon</li>
34443444
<li><code>--live-restore</code> daemon flag:
3445-
<ul><li>keep containers running when daemon shuts down</li></ul></li>
3445+
<ul><li>Keep containers running when daemon shuts down</li></ul></li>
34463446
</ul>
34473447

34483448
<aside class="notes">
@@ -3478,15 +3478,15 @@ <h2>runc — features</h2>
34783478
<li>Generate a spec</li>
34793479
<li>Update resource constraints</li>
34803480
<li>List processes spawned in a container</li>
3481-
<li>Ppause, resume</li>
3481+
<li>Pause, resume</li>
34823482
<li>Checkpoint, restore — CRIU</li>
34833483
</ul>
34843484
</section>
34853485

34863486
<section>
34873487
<h2>runc — demo</h2>
34883488
<pre><code data-trim data-noescape>
3489-
$ sudo dnf install -y runc
3489+
$ sudo dnf install runc
34903490
<span class="fragment">$ sudo docker create --name=my-container fedora:23 bash</span>
34913491
<span class="fragment">$ mkdir rootfs ; cd rootfs
34923492
$ sudo docker export my-container | tar -xf - ; cd ..</span>

0 commit comments

Comments
 (0)