Fossil SCM
Reverted the build hack to strip out all but the default and darkmode skins in the stock Dockerfile. That was done to cater to a wish for extremely small ARM builds, for fun, not for any practical reason. It conflicts with a key philosophy behind this container project, to create stock Fossil builds by default. "make container-image" should get you a functionally identical binary inside the container as "./configure && make" does outside it.
Commit
3e95d94583a1de1bfe6b48ecd1b676a2a6d485a2e6ac306ee92461b2fb17b869
Parent
f97f90c08dc8fe0…
2 files changed
+1
-2
+1
-2
+1
-2
| --- Dockerfile | ||
| +++ Dockerfile | ||
| @@ -15,11 +15,11 @@ | ||
| 15 | 15 | ### check whether this optional piece exists before using it below. |
| 16 | 16 | RUN set -x \ |
| 17 | 17 | && apk update \ |
| 18 | 18 | && apk upgrade --no-cache \ |
| 19 | 19 | && apk add --no-cache \ |
| 20 | - gcc make moreutils \ | |
| 20 | + gcc make \ | |
| 21 | 21 | linux-headers musl-dev \ |
| 22 | 22 | openssl-dev openssl-libs-static \ |
| 23 | 23 | zlib-dev zlib-static \ |
| 24 | 24 | ; ( apk add --no-cache upx || exit 0 ) |
| 25 | 25 | |
| @@ -51,11 +51,10 @@ | ||
| 51 | 51 | ADD $FSLURL $FSLSTB |
| 52 | 52 | RUN set -x \ |
| 53 | 53 | && if [ -d $FSLSTB ] ; then mv $FSLSTB/src fsl ; \ |
| 54 | 54 | else tar -C fsl -xzf fsl/src.tar.gz ; fi \ |
| 55 | 55 | && m=fsl/src/src/main.mk \ |
| 56 | - && grep -v '/skins/[a-ce-z]' $m | sponge $m \ | |
| 57 | 56 | && fsl/src/configure --static CFLAGS='-Os -s' && make -j11 \ |
| 58 | 57 | && if [ -x /usr/bin/upx ] ; then upx -9q fossil ; fi |
| 59 | 58 | |
| 60 | 59 | |
| 61 | 60 | ## --------------------------------------------------------------------- |
| 62 | 61 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -15,11 +15,11 @@ | |
| 15 | ### check whether this optional piece exists before using it below. |
| 16 | RUN set -x \ |
| 17 | && apk update \ |
| 18 | && apk upgrade --no-cache \ |
| 19 | && apk add --no-cache \ |
| 20 | gcc make moreutils \ |
| 21 | linux-headers musl-dev \ |
| 22 | openssl-dev openssl-libs-static \ |
| 23 | zlib-dev zlib-static \ |
| 24 | ; ( apk add --no-cache upx || exit 0 ) |
| 25 | |
| @@ -51,11 +51,10 @@ | |
| 51 | ADD $FSLURL $FSLSTB |
| 52 | RUN set -x \ |
| 53 | && if [ -d $FSLSTB ] ; then mv $FSLSTB/src fsl ; \ |
| 54 | else tar -C fsl -xzf fsl/src.tar.gz ; fi \ |
| 55 | && m=fsl/src/src/main.mk \ |
| 56 | && grep -v '/skins/[a-ce-z]' $m | sponge $m \ |
| 57 | && fsl/src/configure --static CFLAGS='-Os -s' && make -j11 \ |
| 58 | && if [ -x /usr/bin/upx ] ; then upx -9q fossil ; fi |
| 59 | |
| 60 | |
| 61 | ## --------------------------------------------------------------------- |
| 62 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -15,11 +15,11 @@ | |
| 15 | ### check whether this optional piece exists before using it below. |
| 16 | RUN set -x \ |
| 17 | && apk update \ |
| 18 | && apk upgrade --no-cache \ |
| 19 | && apk add --no-cache \ |
| 20 | gcc make \ |
| 21 | linux-headers musl-dev \ |
| 22 | openssl-dev openssl-libs-static \ |
| 23 | zlib-dev zlib-static \ |
| 24 | ; ( apk add --no-cache upx || exit 0 ) |
| 25 | |
| @@ -51,11 +51,10 @@ | |
| 51 | ADD $FSLURL $FSLSTB |
| 52 | RUN set -x \ |
| 53 | && if [ -d $FSLSTB ] ; then mv $FSLSTB/src fsl ; \ |
| 54 | else tar -C fsl -xzf fsl/src.tar.gz ; fi \ |
| 55 | && m=fsl/src/src/main.mk \ |
| 56 | && fsl/src/configure --static CFLAGS='-Os -s' && make -j11 \ |
| 57 | && if [ -x /usr/bin/upx ] ; then upx -9q fossil ; fi |
| 58 | |
| 59 | |
| 60 | ## --------------------------------------------------------------------- |
| 61 |
+1
-2
| --- www/containers.md | ||
| +++ www/containers.md | ||
| @@ -32,12 +32,11 @@ | ||
| 32 | 32 | Fossil default to 8080 internally, then remap it to wherever we want it |
| 33 | 33 | on the host instead. |
| 34 | 34 | |
| 35 | 35 | Our stock `Dockerfile` configures Fossil with the default feature set, |
| 36 | 36 | so you may wish to modify the `Dockerfile` to add configuration options, |
| 37 | -add APK packages to support those options, and so forth. It also strips | |
| 38 | -out all but the default and darkmode skins to save executable space. | |
| 37 | +add APK packages to support those options, and so forth. | |
| 39 | 38 | |
| 40 | 39 | The Fossil `Makefile` provides two convenience targets, |
| 41 | 40 | “`make container-image`” and “`make container-run`”. The first creates a |
| 42 | 41 | versioned container image, and the second does that and then launches a |
| 43 | 42 | fresh container based on that image. You can pass extra arguments to the |
| 44 | 43 |
| --- www/containers.md | |
| +++ www/containers.md | |
| @@ -32,12 +32,11 @@ | |
| 32 | Fossil default to 8080 internally, then remap it to wherever we want it |
| 33 | on the host instead. |
| 34 | |
| 35 | Our stock `Dockerfile` configures Fossil with the default feature set, |
| 36 | so you may wish to modify the `Dockerfile` to add configuration options, |
| 37 | add APK packages to support those options, and so forth. It also strips |
| 38 | out all but the default and darkmode skins to save executable space. |
| 39 | |
| 40 | The Fossil `Makefile` provides two convenience targets, |
| 41 | “`make container-image`” and “`make container-run`”. The first creates a |
| 42 | versioned container image, and the second does that and then launches a |
| 43 | fresh container based on that image. You can pass extra arguments to the |
| 44 |
| --- www/containers.md | |
| +++ www/containers.md | |
| @@ -32,12 +32,11 @@ | |
| 32 | Fossil default to 8080 internally, then remap it to wherever we want it |
| 33 | on the host instead. |
| 34 | |
| 35 | Our stock `Dockerfile` configures Fossil with the default feature set, |
| 36 | so you may wish to modify the `Dockerfile` to add configuration options, |
| 37 | add APK packages to support those options, and so forth. |
| 38 | |
| 39 | The Fossil `Makefile` provides two convenience targets, |
| 40 | “`make container-image`” and “`make container-run`”. The first creates a |
| 41 | versioned container image, and the second does that and then launches a |
| 42 | fresh container based on that image. You can pass extra arguments to the |
| 43 |