Final changes

nicholasdille · May 18, 2020 · 5acf9e5 · 5acf9e5
1 parent 83ea6f9
commit 5acf9e5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/110_ecosystem/buildkit/secrets/slides.template.md b/110_ecosystem/buildkit/secrets/slides.template.md
@@ -2,7 +2,7 @@
 
 Do not provide secrets using environment variables
 
-`ENV`/`--env` burns variables into image
+`ENV` burns variables into image
 
 Build arguments (`ARG`/`--build-arg`) are only one option
 

diff --git a/110_ecosystem/buildkit/usage/buildkit_dockercon.template.md b/110_ecosystem/buildkit/usage/buildkit_dockercon.template.md
@@ -7,3 +7,9 @@ Requires daemon and CLI
 <!-- include: buildkit_locally-0.command -->
 
 <!-- include: buildkit_locally-1.command -->
+
+--
+
+## Demo: BuildKit daemonless containerized
+
+<!-- include: daemonless_containerized-0.command -->
diff --git a/110_ecosystem/buildkit/usage/daemonless_containerized.demo b/110_ecosystem/buildkit/usage/daemonless_containerized.demo
@@ -0,0 +1,12 @@
+# Usage: BuildKit daemonless containerized
+
+# Run a containerized BuildKit daemon on-demand
+docker run -it \
+    --privileged \
+    --volume $PWD:/src \
+    --workdir /src \
+    --entrypoint buildctl-daemonless.sh \
+    moby/buildkit build \
+        --frontend dockerfile.v0 \
+        --local context=. \
+        --local dockerfile=.
diff --git a/110_ecosystem/buildkit/usage/overview.template.md b/110_ecosystem/buildkit/usage/overview.template.md
@@ -6,9 +6,9 @@ Uses a client/server architecture (daemon and CLI)
 
 |            | Locally | Containerized | Rootless |
 |------------|:-------:|:-------------:|:--------:|
-| Docker     | X       | Demo          | experimental
+| Docker     | X       | X             | experimental
 | Daemon/CLI | Demo    | X             | X
-| Daemonless | X       | X             | Demo
+| Daemonless | X       | Demo          | X
 
 Daemonless is just a wrapper for daemon/CLI
 

diff --git a/DockerCon2020Live-HowToImproveYourImageBuildsUsingBuildKit.html b/DockerCon2020Live-HowToImproveYourImageBuildsUsingBuildKit.html
@@ -73,9 +73,7 @@
     <section data-markdown="110_ecosystem/buildkit/cache/slides.final.md" data-separator="^---$" data-separator-vertical="^--$"></section>
 
     <section data-markdown="110_ecosystem/buildkit/usage/overview.final.md" data-separator="^---$" data-separator-vertical="^--$"></section>
-    <section data-markdown="110_ecosystem/buildkit/usage/docker_dockercon.final.md" data-separator="^---$" data-separator-vertical="^--$"></section>
     <section data-markdown="110_ecosystem/buildkit/usage/buildkit_dockercon.final.md" data-separator="^---$" data-separator-vertical="^--$"></section>
-    <section data-markdown="110_ecosystem/buildkit/rootless/dockercon.final.md" data-separator="^---$" data-separator-vertical="^--$"></section>
     <section data-markdown="110_ecosystem/buildkit/transition.final.md" data-separator="^---$" data-separator-vertical="^--$"></section>
 
     <section data-markdown="" data-separator="^---$" data-separator-vertical="^--$"><textarea data-template="">