From a56ed60e23fea1e83692027bf9ed34cce1ae7f8b Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 10 Jun 2024 15:23:02 -0700 Subject: [PATCH] =?UTF-8?q?Add=20missing=20`set=20-e`=20to=20our=20`nslook?= =?UTF-8?q?up`=20smoke=20test=20=F0=9F=98=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently missing for ~5 years 🤦 --- Dockerfile-builder.template | 3 ++- latest-1/glibc/Dockerfile.builder | 3 ++- latest-1/musl/Dockerfile.builder | 3 ++- latest-1/uclibc/Dockerfile.builder | 3 ++- latest/glibc/Dockerfile.builder | 3 ++- latest/musl/Dockerfile.builder | 3 ++- latest/uclibc/Dockerfile.builder | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Dockerfile-builder.template b/Dockerfile-builder.template index fa9f006d..150ec4d6 100644 --- a/Dockerfile-builder.template +++ b/Dockerfile-builder.template @@ -465,7 +465,8 @@ RUN set -eux; \ [ "$(chroot rootfs date +%Z)" = 'UTC' ] # test and make sure DNS works too -RUN cp -L /etc/resolv.conf rootfs/etc/; \ +RUN set -eux; \ + cp -L /etc/resolv.conf rootfs/etc/; \ chroot rootfs /bin/sh -xec 'nslookup google.com'; \ rm rootfs/etc/resolv.conf diff --git a/latest-1/glibc/Dockerfile.builder b/latest-1/glibc/Dockerfile.builder index 82ae4d26..f3d285fa 100644 --- a/latest-1/glibc/Dockerfile.builder +++ b/latest-1/glibc/Dockerfile.builder @@ -227,7 +227,8 @@ RUN set -eux; \ [ "$(chroot rootfs date +%Z)" = 'UTC' ] # test and make sure DNS works too -RUN cp -L /etc/resolv.conf rootfs/etc/; \ +RUN set -eux; \ + cp -L /etc/resolv.conf rootfs/etc/; \ chroot rootfs /bin/sh -xec 'nslookup google.com'; \ rm rootfs/etc/resolv.conf diff --git a/latest-1/musl/Dockerfile.builder b/latest-1/musl/Dockerfile.builder index 3edb076f..faa23849 100644 --- a/latest-1/musl/Dockerfile.builder +++ b/latest-1/musl/Dockerfile.builder @@ -198,7 +198,8 @@ RUN set -eux; \ [ "$(chroot rootfs date +%Z)" = 'UTC' ] # test and make sure DNS works too -RUN cp -L /etc/resolv.conf rootfs/etc/; \ +RUN set -eux; \ + cp -L /etc/resolv.conf rootfs/etc/; \ chroot rootfs /bin/sh -xec 'nslookup google.com'; \ rm rootfs/etc/resolv.conf diff --git a/latest-1/uclibc/Dockerfile.builder b/latest-1/uclibc/Dockerfile.builder index aa03830a..73b9c74f 100644 --- a/latest-1/uclibc/Dockerfile.builder +++ b/latest-1/uclibc/Dockerfile.builder @@ -357,7 +357,8 @@ RUN set -eux; \ [ "$(chroot rootfs date +%Z)" = 'UTC' ] # test and make sure DNS works too -RUN cp -L /etc/resolv.conf rootfs/etc/; \ +RUN set -eux; \ + cp -L /etc/resolv.conf rootfs/etc/; \ chroot rootfs /bin/sh -xec 'nslookup google.com'; \ rm rootfs/etc/resolv.conf diff --git a/latest/glibc/Dockerfile.builder b/latest/glibc/Dockerfile.builder index 81d62e5d..721032e7 100644 --- a/latest/glibc/Dockerfile.builder +++ b/latest/glibc/Dockerfile.builder @@ -225,7 +225,8 @@ RUN set -eux; \ [ "$(chroot rootfs date +%Z)" = 'UTC' ] # test and make sure DNS works too -RUN cp -L /etc/resolv.conf rootfs/etc/; \ +RUN set -eux; \ + cp -L /etc/resolv.conf rootfs/etc/; \ chroot rootfs /bin/sh -xec 'nslookup google.com'; \ rm rootfs/etc/resolv.conf diff --git a/latest/musl/Dockerfile.builder b/latest/musl/Dockerfile.builder index c9c647c3..1c11ae87 100644 --- a/latest/musl/Dockerfile.builder +++ b/latest/musl/Dockerfile.builder @@ -196,7 +196,8 @@ RUN set -eux; \ [ "$(chroot rootfs date +%Z)" = 'UTC' ] # test and make sure DNS works too -RUN cp -L /etc/resolv.conf rootfs/etc/; \ +RUN set -eux; \ + cp -L /etc/resolv.conf rootfs/etc/; \ chroot rootfs /bin/sh -xec 'nslookup google.com'; \ rm rootfs/etc/resolv.conf diff --git a/latest/uclibc/Dockerfile.builder b/latest/uclibc/Dockerfile.builder index a3584e47..067e1566 100644 --- a/latest/uclibc/Dockerfile.builder +++ b/latest/uclibc/Dockerfile.builder @@ -355,7 +355,8 @@ RUN set -eux; \ [ "$(chroot rootfs date +%Z)" = 'UTC' ] # test and make sure DNS works too -RUN cp -L /etc/resolv.conf rootfs/etc/; \ +RUN set -eux; \ + cp -L /etc/resolv.conf rootfs/etc/; \ chroot rootfs /bin/sh -xec 'nslookup google.com'; \ rm rootfs/etc/resolv.conf