Fossil SCM
Prefixing each shell script section in the Dockerfile with "set -x" broke the checks to prevent running UPX on ARM builds. You can still get release container builds on ARM by copying this fixed Dockerfile to your release checkout.
Commit
b4c3d9a13eecb91de9df0a095c1184ae73875ade9f4c46af801c9fbbc8452acd
Parent
f3adbd88740a28e…
1 file changed
+2
-2
+2
-2
| --- Dockerfile | ||
| +++ Dockerfile | ||
| @@ -19,11 +19,11 @@ | ||
| 19 | 19 | && apk add --no-cache \ |
| 20 | 20 | gcc make moreutils \ |
| 21 | 21 | linux-headers musl-dev \ |
| 22 | 22 | openssl-dev openssl-libs-static \ |
| 23 | 23 | zlib-dev zlib-static \ |
| 24 | - ; apk add --no-cache upx | |
| 24 | + ; ( apk add --no-cache upx || exit 0 ) | |
| 25 | 25 | |
| 26 | 26 | ### Bake the custom BusyBox into another layer. The intent is that this |
| 27 | 27 | ### changes only when we change BBXVER. That will force an update of |
| 28 | 28 | ### the layers below, but this is a rare occurrence. |
| 29 | 29 | ARG BBXVER="1_35_0" |
| @@ -31,11 +31,11 @@ | ||
| 31 | 31 | COPY containers/busybox-config /tmp/bbx/.config |
| 32 | 32 | ADD $BBXURL /tmp/bbx/src.tar.gz |
| 33 | 33 | RUN set -x \ |
| 34 | 34 | && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \ |
| 35 | 35 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) \ |
| 36 | - && if [ -x /usr/bin/upx ] ; then upx -9q bbx/busybox ; fi | |
| 36 | + && test ! -x /usr/bin/upx || upx -9q bbx/busybox | |
| 37 | 37 | |
| 38 | 38 | ### The changeable Fossil layer is the only one in the first stage that |
| 39 | 39 | ### changes often, so add it last, to make it independent of the others. |
| 40 | 40 | ### |
| 41 | 41 | ### $FSLSTB can be either a file or a directory due to a ADD's bizarre |
| 42 | 42 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -19,11 +19,11 @@ | |
| 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 |
| 25 | |
| 26 | ### Bake the custom BusyBox into another layer. The intent is that this |
| 27 | ### changes only when we change BBXVER. That will force an update of |
| 28 | ### the layers below, but this is a rare occurrence. |
| 29 | ARG BBXVER="1_35_0" |
| @@ -31,11 +31,11 @@ | |
| 31 | COPY containers/busybox-config /tmp/bbx/.config |
| 32 | ADD $BBXURL /tmp/bbx/src.tar.gz |
| 33 | RUN set -x \ |
| 34 | && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \ |
| 35 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) \ |
| 36 | && if [ -x /usr/bin/upx ] ; then upx -9q bbx/busybox ; fi |
| 37 | |
| 38 | ### The changeable Fossil layer is the only one in the first stage that |
| 39 | ### changes often, so add it last, to make it independent of the others. |
| 40 | ### |
| 41 | ### $FSLSTB can be either a file or a directory due to a ADD's bizarre |
| 42 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -19,11 +19,11 @@ | |
| 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 | |
| 26 | ### Bake the custom BusyBox into another layer. The intent is that this |
| 27 | ### changes only when we change BBXVER. That will force an update of |
| 28 | ### the layers below, but this is a rare occurrence. |
| 29 | ARG BBXVER="1_35_0" |
| @@ -31,11 +31,11 @@ | |
| 31 | COPY containers/busybox-config /tmp/bbx/.config |
| 32 | ADD $BBXURL /tmp/bbx/src.tar.gz |
| 33 | RUN set -x \ |
| 34 | && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \ |
| 35 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) \ |
| 36 | && test ! -x /usr/bin/upx || upx -9q bbx/busybox |
| 37 | |
| 38 | ### The changeable Fossil layer is the only one in the first stage that |
| 39 | ### changes often, so add it last, to make it independent of the others. |
| 40 | ### |
| 41 | ### $FSLSTB can be either a file or a directory due to a ADD's bizarre |
| 42 |