From 0f422225f47bdcc194266548b06cfc92815e1bbd Mon Sep 17 00:00:00 2001 From: Tim Kimber Date: Fri, 2 Oct 2020 15:09:50 +0100 Subject: [PATCH] Update all docker images to include drill (for unit tests) --- test/Dockerfile-alpine | 2 +- test/Dockerfile-centos6 | 2 +- test/Dockerfile-centos7 | 4 +--- test/Dockerfile-centos7-staging | 2 +- test/Dockerfile-debian | 2 +- test/Dockerfile-ubuntu | 2 +- test/Dockerfile-ubuntu-staging | 3 +-- test/Dockerfile-ubuntu16 | 5 +---- test/Dockerfile-ubuntu18 | 2 +- 9 files changed, 9 insertions(+), 15 deletions(-) diff --git a/test/Dockerfile-alpine b/test/Dockerfile-alpine index caad22a..e0f3a6c 100644 --- a/test/Dockerfile-alpine +++ b/test/Dockerfile-alpine @@ -2,7 +2,7 @@ FROM alpine:latest # Note this image uses busybox awk instead of gawk -RUN apk --no-cache add supervisor openssl git curl bind-tools wget nginx bash +RUN apk --no-cache add supervisor openssl git curl bind-tools drill wget nginx bash WORKDIR /root diff --git a/test/Dockerfile-centos6 b/test/Dockerfile-centos6 index 5ffc91c..862e680 100644 --- a/test/Dockerfile-centos6 +++ b/test/Dockerfile-centos6 @@ -8,7 +8,7 @@ FROM centos:centos6 # Update and install required software RUN yum -y update RUN yum -y install epel-release -RUN yum -y install git curl dnsutils wget nginx +RUN yum -y install git curl dnsutils ldns wget nginx WORKDIR /root RUN mkdir /etc/nginx/pki diff --git a/test/Dockerfile-centos7 b/test/Dockerfile-centos7 index 02fbcb7..afbcf23 100644 --- a/test/Dockerfile-centos7 +++ b/test/Dockerfile-centos7 @@ -1,11 +1,9 @@ FROM centos:centos7 -# Note this image uses drill, does not have dig or nslookup installed - # Update and install required software RUN yum -y update RUN yum -y install epel-release -RUN yum -y install git curl ldns wget which nginx +RUN yum -y install git curl ldns bind-utils wget which nginx WORKDIR /root RUN mkdir /etc/nginx/pki diff --git a/test/Dockerfile-centos7-staging b/test/Dockerfile-centos7-staging index 899bf9b..a539cac 100644 --- a/test/Dockerfile-centos7-staging +++ b/test/Dockerfile-centos7-staging @@ -5,7 +5,7 @@ FROM centos:centos7 # 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 +RUN yum -y install git curl bind-utils ldns wget which nginx ENV staging "true" ENV DUCKDNS_TOKEN 1d616aa9-b8e4-4bb4-b312-3289de82badb diff --git a/test/Dockerfile-debian b/test/Dockerfile-debian index b5da5dd..d066813 100644 --- a/test/Dockerfile-debian +++ b/test/Dockerfile-debian @@ -4,7 +4,7 @@ FROM debian:latest # Update and install required software RUN apt-get update --fix-missing -RUN apt-get install -y git curl dnsutils wget nginx-light +RUN apt-get install -y git curl dnsutils ldnsutils wget nginx-light WORKDIR /root RUN mkdir /etc/nginx/pki diff --git a/test/Dockerfile-ubuntu b/test/Dockerfile-ubuntu index 66d7a35..2ef9e25 100644 --- a/test/Dockerfile-ubuntu +++ b/test/Dockerfile-ubuntu @@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND noninteractive # Update and install required software RUN apt-get update --fix-missing -RUN apt-get install -y git curl dnsutils wget nginx-light +RUN apt-get install -y git curl dnsutils ldnsutils wget nginx-light RUN apt-get install -y vim dos2unix # for debugging # TODO test with drill, dig, host diff --git a/test/Dockerfile-ubuntu-staging b/test/Dockerfile-ubuntu-staging index 58762d0..05f0471 100644 --- a/test/Dockerfile-ubuntu-staging +++ b/test/Dockerfile-ubuntu-staging @@ -11,9 +11,8 @@ ENV DUCKDNS_TOKEN 1d616aa9-b8e4-4bb4-b312-3289de82badb # Update and install required software RUN apt-get update --fix-missing -RUN apt-get install -y git curl dnsutils wget nginx-light +RUN apt-get install -y git curl dnsutils ldnsutils wget nginx-light RUN apt-get install -y vim dos2unix # for debugging -# TODO test with drill, dig, host WORKDIR /root diff --git a/test/Dockerfile-ubuntu16 b/test/Dockerfile-ubuntu16 index 030d03a..ba6164c 100644 --- a/test/Dockerfile-ubuntu16 +++ b/test/Dockerfile-ubuntu16 @@ -5,16 +5,13 @@ FROM ubuntu:xenial # Update and install required software RUN apt-get update --fix-missing -RUN apt-get install -y git curl dnsutils wget nginx-light +RUN apt-get install -y git curl dnsutils ldnsutils wget nginx-light WORKDIR /root RUN mkdir /etc/nginx/pki RUN mkdir /etc/nginx/pki/private COPY ./test/test-config/nginx-ubuntu-no-ssl /etc/nginx/sites-enabled/default -# Prevent "Can't load /root/.rnd into RNG" error from openssl -# RUN touch /root/.rnd - # BATS (Bash Automated Testings) RUN git clone https://github.com/bats-core/bats-core.git /bats-core RUN git clone https://github.com/bats-core/bats-support /bats-support diff --git a/test/Dockerfile-ubuntu18 b/test/Dockerfile-ubuntu18 index 1d68cd3..1735646 100644 --- a/test/Dockerfile-ubuntu18 +++ b/test/Dockerfile-ubuntu18 @@ -5,7 +5,7 @@ FROM ubuntu:bionic # Update and install required software RUN apt-get update --fix-missing -RUN apt-get install -y git curl dnsutils wget gawk nginx-light +RUN apt-get install -y git curl dnsutils ldnsutils wget gawk nginx-light WORKDIR /root RUN mkdir /etc/nginx/pki