Fossil SCM
ARM build fixes for the container: * QEMU couldn't cope with "make -j" on the BusyBox step (too many processes) so I changed it to -j11 * Made the new executable step conditional, since there is no upx package in Alpine for either ARM flavor. There's a long bug thread for it on GitHub, which doesn't look to be getting resolved any time soon.
Commit
8849abb733c619b8efd8a84a6636a704c96510d5f06ec8b35e49e8373030b10b
Parent
454397b0cd891a6…
1 file changed
+4
-4
+4
-4
| --- Dockerfile.in | ||
| +++ Dockerfile.in | ||
| @@ -10,20 +10,20 @@ | ||
| 10 | 10 | ADD $FSLURL /tmp/fsl/src.tar.gz |
| 11 | 11 | WORKDIR /tmp |
| 12 | 12 | RUN apk update \ |
| 13 | 13 | && apk upgrade --no-cache \ |
| 14 | 14 | && apk add --no-cache \ |
| 15 | - gcc make moreutils upx \ | |
| 15 | + gcc make moreutils \ | |
| 16 | 16 | linux-headers musl-dev \ |
| 17 | 17 | openssl-dev openssl-libs-static \ |
| 18 | 18 | zlib-dev zlib-static \ |
| 19 | 19 | && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \ |
| 20 | - && ( cd bbx && yes "" | make oldconfig && make -j ) \ | |
| 20 | + && ( cd bbx && yes "" | make oldconfig && make -j11 ) \ | |
| 21 | 21 | && tar -C fsl -xzf fsl/src.tar.gz \ |
| 22 | 22 | && m=fsl/src/main.mk ; grep -v '/skins/[a-ce-z]' $m | sponge $m \ |
| 23 | - && fsl/configure --static CFLAGS='-Os -s' \ | |
| 24 | - && make -j && upx -9 fossil bbx/busybox | |
| 23 | + && fsl/configure --static CFLAGS='-Os -s' && make -j11 \ | |
| 24 | + && if apk add upx ; then upx -9 fossil bbx/busybox ; fi | |
| 25 | 25 | |
| 26 | 26 | # STAGE 2: Pare that back to the bare essentials. |
| 27 | 27 | |
| 28 | 28 | FROM scratch |
| 29 | 29 | WORKDIR /jail |
| 30 | 30 |
| --- Dockerfile.in | |
| +++ Dockerfile.in | |
| @@ -10,20 +10,20 @@ | |
| 10 | ADD $FSLURL /tmp/fsl/src.tar.gz |
| 11 | WORKDIR /tmp |
| 12 | RUN apk update \ |
| 13 | && apk upgrade --no-cache \ |
| 14 | && apk add --no-cache \ |
| 15 | gcc make moreutils upx \ |
| 16 | linux-headers musl-dev \ |
| 17 | openssl-dev openssl-libs-static \ |
| 18 | zlib-dev zlib-static \ |
| 19 | && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \ |
| 20 | && ( cd bbx && yes "" | make oldconfig && make -j ) \ |
| 21 | && tar -C fsl -xzf fsl/src.tar.gz \ |
| 22 | && m=fsl/src/main.mk ; grep -v '/skins/[a-ce-z]' $m | sponge $m \ |
| 23 | && fsl/configure --static CFLAGS='-Os -s' \ |
| 24 | && make -j && upx -9 fossil bbx/busybox |
| 25 | |
| 26 | # STAGE 2: Pare that back to the bare essentials. |
| 27 | |
| 28 | FROM scratch |
| 29 | WORKDIR /jail |
| 30 |
| --- Dockerfile.in | |
| +++ Dockerfile.in | |
| @@ -10,20 +10,20 @@ | |
| 10 | ADD $FSLURL /tmp/fsl/src.tar.gz |
| 11 | WORKDIR /tmp |
| 12 | RUN apk update \ |
| 13 | && apk upgrade --no-cache \ |
| 14 | && apk add --no-cache \ |
| 15 | gcc make moreutils \ |
| 16 | linux-headers musl-dev \ |
| 17 | openssl-dev openssl-libs-static \ |
| 18 | zlib-dev zlib-static \ |
| 19 | && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \ |
| 20 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) \ |
| 21 | && tar -C fsl -xzf fsl/src.tar.gz \ |
| 22 | && m=fsl/src/main.mk ; grep -v '/skins/[a-ce-z]' $m | sponge $m \ |
| 23 | && fsl/configure --static CFLAGS='-Os -s' && make -j11 \ |
| 24 | && if apk add upx ; then upx -9 fossil bbx/busybox ; fi |
| 25 | |
| 26 | # STAGE 2: Pare that back to the bare essentials. |
| 27 | |
| 28 | FROM scratch |
| 29 | WORKDIR /jail |
| 30 |