From cb42728e8cb49057c56b5c99c3fd9f40bf48c8bd Mon Sep 17 00:00:00 2001 From: Tim Kimber Date: Thu, 6 Feb 2020 15:47:27 +0000 Subject: [PATCH] Add debian:latest to test suite --- docker-compose.yml | 31 +++++++++++++++++++++++++++++-- test/Dockerfile-debian | 21 +++++++++++++++++++++ test/run-all-tests.sh | 2 ++ test/test_helper.bash | 2 +- 4 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 test/Dockerfile-debian diff --git a/docker-compose.yml b/docker-compose.yml index ebd5369..fd1aa6e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,6 +102,33 @@ services: - i.alpine.getssl.test - j.alpine.getssl.test - k.alpine.getssl.test + getssl-debian: + build: + context: . + dockerfile: test/Dockerfile-debian + container_name: getssl-debian + volumes: + - .:/getssl + environment: + GETSSL_HOST: debian.getssl.test + GETSSL_IP: 10.30.50.7 + NGINX_CONFIG: /etc/nginx/sites-enabled/default + networks: + acmenet: + ipv4_address: 10.30.50.7 + aliases: + - debian.getssl.test + - a.debian.getssl.test + - b.debian.getssl.test + - c.debian.getssl.test + - d.debian.getssl.test + - e.debian.getssl.test + - f.debian.getssl.test + - g.debian.getssl.test + - h.debian.getssl.test + - i.debian.getssl.test + - j.debian.getssl.test + - k.debian.getssl.test getssl-ubuntu18-no-gawk: build: context: . @@ -111,12 +138,12 @@ services: - .:/getssl environment: GETSSL_HOST: ubuntu18-no-gawk.getssl.test - GETSSL_IP: 10.30.50.7 + GETSSL_IP: 10.30.50.8 NGINX_CONFIG: /etc/nginx/sites-enabled/default TEST_AWK: "yes" networks: acmenet: - ipv4_address: 10.30.50.7 + ipv4_address: 10.30.50.8 aliases: - ubuntu18-no-gawk.getssl.test diff --git a/test/Dockerfile-debian b/test/Dockerfile-debian new file mode 100644 index 0000000..e307ab8 --- /dev/null +++ b/test/Dockerfile-debian @@ -0,0 +1,21 @@ +FROM debian:latest + +# Update and install required software +RUN apt-get update --fix-missing +RUN apt-get install -y git curl dnsutils wget gawk nginx-light # linux-libc-dev make gcc binutils + +WORKDIR /root +RUN mkdir /etc/nginx/pki +RUN mkdir /etc/nginx/pki/private + +# 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/jasonkarns/bats-support /bats-support +RUN git clone https://github.com/jasonkarns/bats-assert-1 /bats-assert +RUN /bats-core/install.sh /usr/local + +# Run eternal loop - for testing +CMD tail -f /dev/null diff --git a/test/run-all-tests.sh b/test/run-all-tests.sh index 7372e5b..df17d7f 100644 --- a/test/run-all-tests.sh +++ b/test/run-all-tests.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +docker exec -it getssl-alpine bats /getssl/test docker exec -it getssl-centos6 bats /getssl/test +docker exec -it getssl-debian bats /getssl/test docker exec -it getssl-ubuntu18 bats /getssl/test docker exec -it getssl-ubuntu18-no-gawk bats /getssl/test/5-old-awk-error.bats diff --git a/test/test_helper.bash b/test/test_helper.bash index 0ac9a43..b33ee0b 100644 --- a/test/test_helper.bash +++ b/test/test_helper.bash @@ -18,7 +18,7 @@ setup_environment() { fi curl -X POST -d '{"host":"'"$GETSSL_HOST"'", "addresses":["'"$GETSSL_IP"'"]}' http://10.30.50.3:8055/add-a - cp ${CODE_DIR}/test/test-config/nginx-ubuntu-no-ssl ${NGINX_CONFIG} + cp ${CODE_DIR}/test/test-config/nginx-ubuntu-no-ssl "${NGINX_CONFIG}" /getssl/test/restart-nginx }