Bladeren bron

Fixed long server name comment, improved dhparam check

Steve Kamerman 8 jaren geleden
bovenliggende
commit
83a28f47d7
2 gewijzigde bestanden met toevoegingen van 5 en 3 verwijderingen
  1. 1 1
      Dockerfile.alpine
  2. 4 2
      test/ssl_dhparam.bats

+ 1 - 1
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

+ 4 - 2
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" {