Fossil SCM
Dropped declaration of Dockerfile syntax version from 1.4 to 1.0. Put it at 1.4 when we were using heredocs, a feature that went from experimental to stable at that version, then failed to drop it back when we replaced the use of heredocs with externally generated files to regain Podman compatibility.
Commit
5b62bfe101390bf3eb2a87cc86ca3621eeedf9df52e6f2df06c6a27de247ebe6
Parent
2210c15d1302904…
1 file changed
+3
-3
+3
-3
| --- Dockerfile | ||
| +++ Dockerfile | ||
| @@ -1,6 +1,6 @@ | ||
| 1 | -# syntax=docker/dockerfile:1.4 | |
| 1 | +# syntax=docker/dockerfile:1.0 | |
| 2 | 2 | # See www/containers.md for documentation on how to use this file. |
| 3 | 3 | |
| 4 | 4 | ## --------------------------------------------------------------------- |
| 5 | 5 | ## STAGE 1: Build static Fossil & BusyBox binaries atop Alpine Linux |
| 6 | 6 | ## --------------------------------------------------------------------- |
| @@ -26,11 +26,11 @@ | ||
| 26 | 26 | ### the layers below, but this is a rare occurrence. |
| 27 | 27 | ARG BBXVER="1_35_0" |
| 28 | 28 | ENV BBXURL "https://github.com/mirror/busybox/tarball/${BBXVER}" |
| 29 | 29 | COPY containers/busybox-config /tmp/bbx/.config |
| 30 | 30 | ADD $BBXURL /tmp/bbx/src.tar.gz |
| 31 | -RUN set -x \ | |
| 31 | +RUN set -x \ | |
| 32 | 32 | && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \ |
| 33 | 33 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) |
| 34 | 34 | |
| 35 | 35 | # Copy in dummied-up OS release info file for those using nspawn. |
| 36 | 36 | # Without this, it'll gripe that the rootfs dir doesn't look like |
| @@ -50,11 +50,11 @@ | ||
| 50 | 50 | ARG FSLCFG="" |
| 51 | 51 | ARG FSLVER="trunk" |
| 52 | 52 | ARG FSLURL="https://fossil-scm.org/home/tarball/src?r=${FSLVER}" |
| 53 | 53 | ENV FSLSTB=/tmp/fsl/src.tar.gz |
| 54 | 54 | ADD $FSLURL $FSLSTB |
| 55 | -RUN set -x \ | |
| 55 | +RUN set -x \ | |
| 56 | 56 | && if [ -d $FSLSTB ] ; then mv $FSLSTB/src fsl ; \ |
| 57 | 57 | else tar -C fsl -xzf fsl/src.tar.gz ; fi \ |
| 58 | 58 | && m=fsl/src/src/main.mk \ |
| 59 | 59 | && fsl/src/configure --static CFLAGS='-Os -s' $FSLCFG && make -j11 |
| 60 | 60 | |
| 61 | 61 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -1,6 +1,6 @@ | |
| 1 | # syntax=docker/dockerfile:1.4 |
| 2 | # See www/containers.md for documentation on how to use this file. |
| 3 | |
| 4 | ## --------------------------------------------------------------------- |
| 5 | ## STAGE 1: Build static Fossil & BusyBox binaries atop Alpine Linux |
| 6 | ## --------------------------------------------------------------------- |
| @@ -26,11 +26,11 @@ | |
| 26 | ### the layers below, but this is a rare occurrence. |
| 27 | ARG BBXVER="1_35_0" |
| 28 | ENV BBXURL "https://github.com/mirror/busybox/tarball/${BBXVER}" |
| 29 | COPY containers/busybox-config /tmp/bbx/.config |
| 30 | ADD $BBXURL /tmp/bbx/src.tar.gz |
| 31 | RUN set -x \ |
| 32 | && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \ |
| 33 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) |
| 34 | |
| 35 | # Copy in dummied-up OS release info file for those using nspawn. |
| 36 | # Without this, it'll gripe that the rootfs dir doesn't look like |
| @@ -50,11 +50,11 @@ | |
| 50 | ARG FSLCFG="" |
| 51 | ARG FSLVER="trunk" |
| 52 | ARG FSLURL="https://fossil-scm.org/home/tarball/src?r=${FSLVER}" |
| 53 | ENV FSLSTB=/tmp/fsl/src.tar.gz |
| 54 | ADD $FSLURL $FSLSTB |
| 55 | RUN set -x \ |
| 56 | && if [ -d $FSLSTB ] ; then mv $FSLSTB/src fsl ; \ |
| 57 | else tar -C fsl -xzf fsl/src.tar.gz ; fi \ |
| 58 | && m=fsl/src/src/main.mk \ |
| 59 | && fsl/src/configure --static CFLAGS='-Os -s' $FSLCFG && make -j11 |
| 60 | |
| 61 |
| --- Dockerfile | |
| +++ Dockerfile | |
| @@ -1,6 +1,6 @@ | |
| 1 | # syntax=docker/dockerfile:1.0 |
| 2 | # See www/containers.md for documentation on how to use this file. |
| 3 | |
| 4 | ## --------------------------------------------------------------------- |
| 5 | ## STAGE 1: Build static Fossil & BusyBox binaries atop Alpine Linux |
| 6 | ## --------------------------------------------------------------------- |
| @@ -26,11 +26,11 @@ | |
| 26 | ### the layers below, but this is a rare occurrence. |
| 27 | ARG BBXVER="1_35_0" |
| 28 | ENV BBXURL "https://github.com/mirror/busybox/tarball/${BBXVER}" |
| 29 | COPY containers/busybox-config /tmp/bbx/.config |
| 30 | ADD $BBXURL /tmp/bbx/src.tar.gz |
| 31 | RUN set -x \ |
| 32 | && tar --strip-components=1 -C bbx -xzf bbx/src.tar.gz \ |
| 33 | && ( cd bbx && yes "" | make oldconfig && make -j11 ) |
| 34 | |
| 35 | # Copy in dummied-up OS release info file for those using nspawn. |
| 36 | # Without this, it'll gripe that the rootfs dir doesn't look like |
| @@ -50,11 +50,11 @@ | |
| 50 | ARG FSLCFG="" |
| 51 | ARG FSLVER="trunk" |
| 52 | ARG FSLURL="https://fossil-scm.org/home/tarball/src?r=${FSLVER}" |
| 53 | ENV FSLSTB=/tmp/fsl/src.tar.gz |
| 54 | ADD $FSLURL $FSLSTB |
| 55 | RUN set -x \ |
| 56 | && if [ -d $FSLSTB ] ; then mv $FSLSTB/src fsl ; \ |
| 57 | else tar -C fsl -xzf fsl/src.tar.gz ; fi \ |
| 58 | && m=fsl/src/src/main.mk \ |
| 59 | && fsl/src/configure --static CFLAGS='-Os -s' $FSLCFG && make -j11 |
| 60 | |
| 61 |