From 1fce9999c45ed90fe984b77e07a16be84388d679 Mon Sep 17 00:00:00 2001
From: Tim Kimber <tkimber@mobius.org.uk>
Date: Tue, 23 Nov 2021 16:42:16 +0000
Subject: [PATCH] Add missing utils to rockylinux8 docker file, fix setup fn

---
 test/2-simple-dns01-dig.bats |  1 -
 test/Dockerfile-rockylinux8  | 13 +++++++------
 test/Dockerfile-ubuntu14     | 11 ++++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/test/2-simple-dns01-dig.bats b/test/2-simple-dns01-dig.bats
index cfac9e9..c5bc854 100644
--- a/test/2-simple-dns01-dig.bats
+++ b/test/2-simple-dns01-dig.bats
@@ -6,7 +6,6 @@ load '/getssl/test/test_helper.bash'
 
 
 setup_file() {
-    [ ! -f $BATS_RUN_TMPDIR/failed.skip ] || skip "skipping tests after first failure"
     if [ -z "$STAGING" ]; then
         export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
     fi
diff --git a/test/Dockerfile-rockylinux8 b/test/Dockerfile-rockylinux8
index 37bff04..7b4da5f 100644
--- a/test/Dockerfile-rockylinux8
+++ b/test/Dockerfile-rockylinux8
@@ -1,12 +1,13 @@
 FROM rockylinux/rockylinux:8
 
 # Update and install required software
-RUN yum -y update
-RUN yum -y install epel-release
-RUN yum -y install git curl bind-utils wget which nginx jq
-RUN yum -y install ftp vsftpd
-RUN yum -y install openssh-server
-RUN yum -y install glibc-locale-source glibc-langpack-en # for en_US.UTF-8 support
+RUN yum -y update && \
+    yum -y install \
+        epel-release \
+        git curl bind-utils wget which nginx jq procps findutils \
+        ftp vsftpd \
+        openssh-server \
+        glibc-locale-source glibc-langpack-en # for en_US.UTF-8 support
 
 # Set locale
 ENV LANG en_US.UTF-8
diff --git a/test/Dockerfile-ubuntu14 b/test/Dockerfile-ubuntu14
index f890339..bf653c4 100644
--- a/test/Dockerfile-ubuntu14
+++ b/test/Dockerfile-ubuntu14
@@ -4,11 +4,12 @@ FROM ubuntu:trusty
 # Note this image uses mawk
 
 # Update and install required software
-RUN apt-get update --fix-missing
-RUN apt-get install -y git curl dnsutils ldnsutils wget nginx-light jq
-RUN apt-get install -y ftp vsftpd
-RUN apt-get install -y openssh-server
-RUN apt-get install -y locales # for idn testing
+RUN apt-get update --fix-missing && \
+    apt-get install -y \
+        git curl dnsutils ldnsutils wget nginx-light jq \
+        ftp vsftpd \
+        openssh-server \
+        locales # for idn testing
 
 # Set locale
 RUN locale-gen en_US.UTF-8