Skip to content

Commit b302bbe

Browse files
committed
Make alpine package build failure propagate to Docker build failure
1 parent 4a3c40d commit b302bbe

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ FROM alpine-sdk as alpine-seabios
2424
ADD patches/seabios/qemu-fw-cfg-fix.patch /root/aports/main/seabios/0003-qemu-fw-cfg-fix.patch
2525

2626
RUN <<EOF
27+
set -e
2728
cd /root/aports/main/seabios
2829
echo 'sha512sums="${sha512sums}$(sha512sum 0003-qemu-fw-cfg-fix.patch)"' >>APKBUILD
2930
echo 'source="${source}0003-qemu-fw-cfg-fix.patch"' >>APKBUILD
@@ -39,6 +40,7 @@ FROM alpine-sdk as alpine-dnsmasq
3940
ADD patches/dnsmasq/remove-passwd-requirement.patch /root/aports/main/dnsmasq/remove-passwd-requirement.patch
4041

4142
RUN <<EOF
43+
set -e
4244
cd /root/aports/main/dnsmasq
4345
echo 'sha512sums="${sha512sums}$(sha512sum remove-passwd-requirement.patch)"' >>APKBUILD
4446
echo 'source="${source}remove-passwd-requirement.patch"' >>APKBUILD
@@ -53,6 +55,7 @@ FROM alpine-sdk as alpine-dropbear
5355
ADD patches/dropbear/runcvm.patch /root/aports/main/dropbear/runcvm.patch
5456

5557
RUN <<EOF
58+
set -e
5659
cd /root/aports/main/dropbear
5760
sed -ri '/--disable-pututline/a --enable-plugin \\' APKBUILD
5861
echo 'sha512sums="${sha512sums}$(sha512sum runcvm.patch)"' >>APKBUILD
@@ -65,7 +68,7 @@ cd dropbear-epka
6568
apk add --no-cache automake autoconf libtool
6669
libtoolize --force
6770
aclocal
68-
autoheader
71+
autoheader || true
6972
automake --force-missing --add-missing
7073
autoconf
7174
./configure
@@ -80,6 +83,7 @@ FROM alpine-sdk as alpine-mkinitfs
8083
ADD patches/mkinitfs/nlplug-findfs.patch /root/aports/main/mkinitfs/nlplug-findfs.patch
8184

8285
RUN <<EOF
86+
set -e
8387
cd /root/aports/main/mkinitfs
8488
echo 'sha512sums="${sha512sums}$(sha512sum nlplug-findfs.patch)"' >>APKBUILD
8589
echo 'source="${source} nlplug-findfs.patch"' >>APKBUILD

0 commit comments

Comments
 (0)