From 83a28f47d77ffa90b99116682d10450dc9808e18 Mon Sep 17 00:00:00 2001 From: Steve Kamerman Date: Thu, 12 Jan 2017 17:43:13 -0500 Subject: [PATCH] Fixed long server name comment, improved dhparam check --- Dockerfile.alpine | 2 +- test/ssl_dhparam.bats | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 3d03cf3..25485d8 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -6,7 +6,7 @@ RUN apk add --no-cache --virtual .run-deps \ ca-certificates bash wget openssl \ && update-ca-certificates -# Configure Nginx and apply fix for very long server names +# Configure Nginx RUN echo "daemon off;" >> /etc/nginx/nginx.conf # Install Forego diff --git a/test/ssl_dhparam.bats b/test/ssl_dhparam.bats index 2d16595..2ca8a08 100644 --- a/test/ssl_dhparam.bats +++ b/test/ssl_dhparam.bats @@ -78,9 +78,11 @@ function setup { assert_success docker_wait_for_log $SUT_CONTAINER 9 "Watching docker events" + sleep 3 + run docker logs $SUT_CONTAINER + # THEN - run docker exec $SUT_CONTAINER ps aux - refute_output -p "openssl" + refute_output -p "Generating DH parameters" } @test "[$TEST_FILE] stop all bats containers" {