Fossil SCM

A few more small tweaks to the containers doc

wyoung 2023-04-19 11:55 trunk
Commit 117cf4ffe8ec6bf43853d2416df5052d8b365f82ca594f4561d6f903e71b601d
Parent bb189d17f248aa3…
1 file changed +10 -10
~ www/containers.md
M www/containers.md
+10 -10
--- www/containers.md
+++ www/containers.md
@@ -399,11 +399,11 @@
399399
400400
 ### 5.3 <a id="cengine"></a>Container Engine
401401
402402
 Although the Fossil container build system defaults to Docker, we allow
403403
 for use of any OCI container system that implements the same interfaces.
404
-We go into more details about this in [the next section](#light), but
404
+We go into more details about this [below](#light), but
405405
 for now, it suffices to point out that you can switch to Podman while
406406
 using our `Makefile` convenience targets unchanged by saying:
407407
408408
 ```
409409
 $ make CENGINE=podman container-run
@@ -420,11 +420,11 @@
420420
 $ make container-image \
421421
 DBFLAGS='--build-arg FSLCFG="--json --with-th1-docs"'
422422
 ```
423423
424424
 If you also wanted [the Tcl evaluation extension](./th1.md#tclEval),
425
-that brings us to [the next section](#run).
425
+that brings us to [the next point](#run).
426426
427427
428428
 ### 5.5 <a id="run"></a>Elaborating the Run Layer
429429
430430
 If you want a basic shell environment for temporary debugging of the
@@ -435,11 +435,11 @@
435435
436436
 …to this:
437437
438438
 FROM busybox AS run
439439
440
-Rebuild, redeploy, and your Fossil container will have a [BusyBox]-based
440
+Rebuild and redeploy to give your Fossil container a [BusyBox]-based
441441
 shell environment that you can get into via:
442442
443443
 $ docker exec -it -u fossil $(make container-version) sh
444444
445445
 (That command assumes you built it via “`make container`” and are
@@ -628,12 +628,12 @@
628628
 [runc]: https://github.com/opencontainers/runc
629629
630630
631631
 ### 6.2 <a id="podman"></a>Podman
632632
633
-A lighter-weight [rootless] [drop-in replacement][whatis] that doesn’t
634
-give up the image builder is [Podman]. Initially created by
633
+A lighter-weight [rootless][rl] [drop-in replacement][whatis] that
634
+doesn’t give up the image builder is [Podman]. Initially created by
635635
 Red Hat and thus popular on that family of OSes, it will run on
636636
 any flavor of Linux. It can even be made to run [on macOS via Homebrew][pmmac]
637637
 or [on Windows via WSL2][pmwin].
638638
639639
 On Ubuntu 22.04, the installation size is about 38&nbsp;MiB, roughly a
@@ -668,15 +668,15 @@
668668
 --publish 127.0.0.1:9999:8080 \
669669
 localhost/fossil
670670
 $ podman start fossil
671671
 ```
672672
673
-[pmmac]: https://podman.io/getting-started/installation.html#macos
674
-[pmwin]: https://github.com/containers/podman/blob/main/docs/tutorials/podman-for-windows.md
675
-[Podman]: https://podman.io/
676
-[rootless]: https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md
677
-[whatis]: https://podman.io/whatis.html
673
+[pmmac]: https://podman.io/getting-started/installation.html#macos
674
+[pmwin]: https://github.com/containers/podman/blob/main/docs/tutorials/podman-for-windows.md
675
+[Podman]: https://podman.io/
676
+[rl]: https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md
677
+[whatis]: https://podman.io/whatis.html
678678
679679
680680
 ### 6.3 <a id="nspawn"></a>`systemd-container`
681681
682682
 If even the Podman stack is too big for you, the next-best option I’m
683683
--- www/containers.md
+++ www/containers.md
@@ -399,11 +399,11 @@
399
400 ### 5.3 <a id="cengine"></a>Container Engine
401
402 Although the Fossil container build system defaults to Docker, we allow
403 for use of any OCI container system that implements the same interfaces.
404 We go into more details about this in [the next section](#light), but
405 for now, it suffices to point out that you can switch to Podman while
406 using our `Makefile` convenience targets unchanged by saying:
407
408 ```
409 $ make CENGINE=podman container-run
@@ -420,11 +420,11 @@
420 $ make container-image \
421 DBFLAGS='--build-arg FSLCFG="--json --with-th1-docs"'
422 ```
423
424 If you also wanted [the Tcl evaluation extension](./th1.md#tclEval),
425 that brings us to [the next section](#run).
426
427
428 ### 5.5 <a id="run"></a>Elaborating the Run Layer
429
430 If you want a basic shell environment for temporary debugging of the
@@ -435,11 +435,11 @@
435
436 …to this:
437
438 FROM busybox AS run
439
440 Rebuild, redeploy, and your Fossil container will have a [BusyBox]-based
441 shell environment that you can get into via:
442
443 $ docker exec -it -u fossil $(make container-version) sh
444
445 (That command assumes you built it via “`make container`” and are
@@ -628,12 +628,12 @@
628 [runc]: https://github.com/opencontainers/runc
629
630
631 ### 6.2 <a id="podman"></a>Podman
632
633 A lighter-weight [rootless] [drop-in replacement][whatis] that doesn’t
634 give up the image builder is [Podman]. Initially created by
635 Red Hat and thus popular on that family of OSes, it will run on
636 any flavor of Linux. It can even be made to run [on macOS via Homebrew][pmmac]
637 or [on Windows via WSL2][pmwin].
638
639 On Ubuntu 22.04, the installation size is about 38&nbsp;MiB, roughly a
@@ -668,15 +668,15 @@
668 --publish 127.0.0.1:9999:8080 \
669 localhost/fossil
670 $ podman start fossil
671 ```
672
673 [pmmac]: https://podman.io/getting-started/installation.html#macos
674 [pmwin]: https://github.com/containers/podman/blob/main/docs/tutorials/podman-for-windows.md
675 [Podman]: https://podman.io/
676 [rootless]: https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md
677 [whatis]: https://podman.io/whatis.html
678
679
680 ### 6.3 <a id="nspawn"></a>`systemd-container`
681
682 If even the Podman stack is too big for you, the next-best option I’m
683
--- www/containers.md
+++ www/containers.md
@@ -399,11 +399,11 @@
399
400 ### 5.3 <a id="cengine"></a>Container Engine
401
402 Although the Fossil container build system defaults to Docker, we allow
403 for use of any OCI container system that implements the same interfaces.
404 We go into more details about this [below](#light), but
405 for now, it suffices to point out that you can switch to Podman while
406 using our `Makefile` convenience targets unchanged by saying:
407
408 ```
409 $ make CENGINE=podman container-run
@@ -420,11 +420,11 @@
420 $ make container-image \
421 DBFLAGS='--build-arg FSLCFG="--json --with-th1-docs"'
422 ```
423
424 If you also wanted [the Tcl evaluation extension](./th1.md#tclEval),
425 that brings us to [the next point](#run).
426
427
428 ### 5.5 <a id="run"></a>Elaborating the Run Layer
429
430 If you want a basic shell environment for temporary debugging of the
@@ -435,11 +435,11 @@
435
436 …to this:
437
438 FROM busybox AS run
439
440 Rebuild and redeploy to give your Fossil container a [BusyBox]-based
441 shell environment that you can get into via:
442
443 $ docker exec -it -u fossil $(make container-version) sh
444
445 (That command assumes you built it via “`make container`” and are
@@ -628,12 +628,12 @@
628 [runc]: https://github.com/opencontainers/runc
629
630
631 ### 6.2 <a id="podman"></a>Podman
632
633 A lighter-weight [rootless][rl] [drop-in replacement][whatis] that
634 doesn’t give up the image builder is [Podman]. Initially created by
635 Red Hat and thus popular on that family of OSes, it will run on
636 any flavor of Linux. It can even be made to run [on macOS via Homebrew][pmmac]
637 or [on Windows via WSL2][pmwin].
638
639 On Ubuntu 22.04, the installation size is about 38&nbsp;MiB, roughly a
@@ -668,15 +668,15 @@
668 --publish 127.0.0.1:9999:8080 \
669 localhost/fossil
670 $ podman start fossil
671 ```
672
673 [pmmac]: https://podman.io/getting-started/installation.html#macos
674 [pmwin]: https://github.com/containers/podman/blob/main/docs/tutorials/podman-for-windows.md
675 [Podman]: https://podman.io/
676 [rl]: https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md
677 [whatis]: https://podman.io/whatis.html
678
679
680 ### 6.3 <a id="nspawn"></a>`systemd-container`
681
682 If even the Podman stack is too big for you, the next-best option I’m
683

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button