Fossil SCM
Comment improvements in the Dockerfile
Commit
693c7b9bd57e53d11d801713fb4ba229dc98ef71d16f750fbc2061c1db6676c3
Parent
8defefd3ff8dfe1…
1 file changed
+6
-6
+6
-6
| --- Dockerfile | ||
| +++ Dockerfile | ||
| @@ -3,19 +3,19 @@ | ||
| 3 | 3 | |
| 4 | 4 | ## --------------------------------------------------------------------- |
| 5 | 5 | ## STAGE 1: Build static Fossil binary |
| 6 | 6 | ## --------------------------------------------------------------------- |
| 7 | 7 | |
| 8 | -### We aren't pinning to a more stable version of Alpine because we want | |
| 8 | +### We don't pin a more stable version of our base layer because we want | |
| 9 | 9 | ### to build with the latest tools and libraries available in case they |
| 10 | 10 | ### fixed something that matters to us since the last build. Everything |
| 11 | 11 | ### below depends on this layer, and so, alas, we toss this container's |
| 12 | 12 | ### cache on Alpine's release schedule, roughly once a month. |
| 13 | 13 | FROM alpine:latest AS bld |
| 14 | 14 | WORKDIR /fsl |
| 15 | 15 | |
| 16 | -### Bake the basic Alpine Linux into a base layer so it only changes | |
| 16 | +### Bake the build-time userland into a base layer so it only changes | |
| 17 | 17 | ### when the upstream image is updated or we change the package set. |
| 18 | 18 | RUN set -x \ |
| 19 | 19 | && apk update \ |
| 20 | 20 | && apk upgrade --no-cache \ |
| 21 | 21 | && apk add --no-cache \ |
| @@ -23,19 +23,19 @@ | ||
| 23 | 23 | linux-headers musl-dev \ |
| 24 | 24 | openssl-dev openssl-libs-static \ |
| 25 | 25 | zlib-dev zlib-static |
| 26 | 26 | |
| 27 | 27 | ### Build Fossil as a separate layer so we don't have to rebuild the |
| 28 | -### Alpine environment for each iteration of Fossil's dev cycle. | |
| 28 | +### userland for each iteration of Fossil's dev cycle. | |
| 29 | 29 | ### |
| 30 | 30 | ### We must cope with a bizarre ADD misfeature here: it unpacks tarballs |
| 31 | 31 | ### automatically when you give it a local file name but not if you give |
| 32 | 32 | ### it a /tarball URL! It matters because we default to a URL in case |
| 33 | 33 | ### you're building outside a Fossil checkout, but when building via the |
| 34 | -### container-image target, we avoid a costly hit on fossil-scm.org | |
| 35 | -### by leveraging its DVCS nature via the "tarball" command and passing | |
| 36 | -### the resulting file's name in. | |
| 34 | +### container-image target, we avoid a costly hit on fossil-scm.org by | |
| 35 | +### leveraging its DVCS nature via the "tarball" command and passing the | |
| 36 | +### resulting file's name in. | |
| 37 | 37 | ARG FSLCFG="" |
| 38 | 38 | ARG FSLVER="trunk" |
| 39 | 39 | ARG FSLURL="https://fossil-scm.org/home/tarball/src?r=${FSLVER}" |
| 40 | 40 | ENV FSLSTB=/fsl/src.tar.gz |
| 41 | 41 | ADD $FSLURL $FSLSTB |
| 42 | 42 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -3,19 +3,19 @@ | |
| 3 | |
| 4 | ## --------------------------------------------------------------------- |
| 5 | ## STAGE 1: Build static Fossil binary |
| 6 | ## --------------------------------------------------------------------- |
| 7 | |
| 8 | ### We aren't pinning to a more stable version of Alpine because we want |
| 9 | ### to build with the latest tools and libraries available in case they |
| 10 | ### fixed something that matters to us since the last build. Everything |
| 11 | ### below depends on this layer, and so, alas, we toss this container's |
| 12 | ### cache on Alpine's release schedule, roughly once a month. |
| 13 | FROM alpine:latest AS bld |
| 14 | WORKDIR /fsl |
| 15 | |
| 16 | ### Bake the basic Alpine Linux into a base layer so it only changes |
| 17 | ### when the upstream image is updated or we change the package set. |
| 18 | RUN set -x \ |
| 19 | && apk update \ |
| 20 | && apk upgrade --no-cache \ |
| 21 | && apk add --no-cache \ |
| @@ -23,19 +23,19 @@ | |
| 23 | linux-headers musl-dev \ |
| 24 | openssl-dev openssl-libs-static \ |
| 25 | zlib-dev zlib-static |
| 26 | |
| 27 | ### Build Fossil as a separate layer so we don't have to rebuild the |
| 28 | ### Alpine environment for each iteration of Fossil's dev cycle. |
| 29 | ### |
| 30 | ### We must cope with a bizarre ADD misfeature here: it unpacks tarballs |
| 31 | ### automatically when you give it a local file name but not if you give |
| 32 | ### it a /tarball URL! It matters because we default to a URL in case |
| 33 | ### you're building outside a Fossil checkout, but when building via the |
| 34 | ### container-image target, we avoid a costly hit on fossil-scm.org |
| 35 | ### by leveraging its DVCS nature via the "tarball" command and passing |
| 36 | ### the resulting file's name in. |
| 37 | ARG FSLCFG="" |
| 38 | ARG FSLVER="trunk" |
| 39 | ARG FSLURL="https://fossil-scm.org/home/tarball/src?r=${FSLVER}" |
| 40 | ENV FSLSTB=/fsl/src.tar.gz |
| 41 | ADD $FSLURL $FSLSTB |
| 42 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -3,19 +3,19 @@ | |
| 3 | |
| 4 | ## --------------------------------------------------------------------- |
| 5 | ## STAGE 1: Build static Fossil binary |
| 6 | ## --------------------------------------------------------------------- |
| 7 | |
| 8 | ### We don't pin a more stable version of our base layer because we want |
| 9 | ### to build with the latest tools and libraries available in case they |
| 10 | ### fixed something that matters to us since the last build. Everything |
| 11 | ### below depends on this layer, and so, alas, we toss this container's |
| 12 | ### cache on Alpine's release schedule, roughly once a month. |
| 13 | FROM alpine:latest AS bld |
| 14 | WORKDIR /fsl |
| 15 | |
| 16 | ### Bake the build-time userland into a base layer so it only changes |
| 17 | ### when the upstream image is updated or we change the package set. |
| 18 | RUN set -x \ |
| 19 | && apk update \ |
| 20 | && apk upgrade --no-cache \ |
| 21 | && apk add --no-cache \ |
| @@ -23,19 +23,19 @@ | |
| 23 | linux-headers musl-dev \ |
| 24 | openssl-dev openssl-libs-static \ |
| 25 | zlib-dev zlib-static |
| 26 | |
| 27 | ### Build Fossil as a separate layer so we don't have to rebuild the |
| 28 | ### userland for each iteration of Fossil's dev cycle. |
| 29 | ### |
| 30 | ### We must cope with a bizarre ADD misfeature here: it unpacks tarballs |
| 31 | ### automatically when you give it a local file name but not if you give |
| 32 | ### it a /tarball URL! It matters because we default to a URL in case |
| 33 | ### you're building outside a Fossil checkout, but when building via the |
| 34 | ### container-image target, we avoid a costly hit on fossil-scm.org by |
| 35 | ### leveraging its DVCS nature via the "tarball" command and passing the |
| 36 | ### resulting file's name in. |
| 37 | ARG FSLCFG="" |
| 38 | ARG FSLVER="trunk" |
| 39 | ARG FSLURL="https://fossil-scm.org/home/tarball/src?r=${FSLVER}" |
| 40 | ENV FSLSTB=/fsl/src.tar.gz |
| 41 | ADD $FSLURL $FSLSTB |
| 42 |