Browse Source

Update all docker images to include drill (for unit tests)

pull/590/head
Tim Kimber 5 years ago
parent
commit
0f422225f4
No known key found for this signature in database GPG Key ID: 3E1804964E76BD18
9 changed files with 9 additions and 15 deletions
  1. +1
    -1
      test/Dockerfile-alpine
  2. +1
    -1
      test/Dockerfile-centos6
  3. +1
    -3
      test/Dockerfile-centos7
  4. +1
    -1
      test/Dockerfile-centos7-staging
  5. +1
    -1
      test/Dockerfile-debian
  6. +1
    -1
      test/Dockerfile-ubuntu
  7. +1
    -2
      test/Dockerfile-ubuntu-staging
  8. +1
    -4
      test/Dockerfile-ubuntu16
  9. +1
    -1
      test/Dockerfile-ubuntu18

+ 1
- 1
test/Dockerfile-alpine View File

@ -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


+ 1
- 1
test/Dockerfile-centos6 View File

@ -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


+ 1
- 3
test/Dockerfile-centos7 View File

@ -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


+ 1
- 1
test/Dockerfile-centos7-staging View File

@ -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


+ 1
- 1
test/Dockerfile-debian View File

@ -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


+ 1
- 1
test/Dockerfile-ubuntu View File

@ -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


+ 1
- 2
test/Dockerfile-ubuntu-staging View File

@ -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


+ 1
- 4
test/Dockerfile-ubuntu16 View File

@ -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


+ 1
- 1
test/Dockerfile-ubuntu18 View File

@ -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


Loading…
Cancel
Save