mirror of
				https://github.com/dcarrillo/docker-nginx.git
				synced 2025-10-31 00:39:09 +00:00 
			
		
		
		
	Bump nginx version to 1.18.0
This commit is contained in:
		| @@ -79,5 +79,11 @@ http { | ||||
|         location = /nginx_status { | ||||
|             stub_status on; | ||||
|         } | ||||
|  | ||||
|         location = /phpfpm_status { | ||||
|             include /usr/local/nginx/conf/fastcgi_params; | ||||
|             fastcgi_pass   php:9000; | ||||
|             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -27,6 +27,7 @@ _cleanup() | ||||
|     echo "Cleaning up..." | ||||
|     docker rm -f "${NGINX_VERSION}"_test > /dev/null 2>&1 | ||||
|     docker rm -f "${NGINX_VERSION}"_requester > /dev/null 2>&1 | ||||
|     docker rm -f php > /dev/null 2>&1 | ||||
|     rm -rf "$TMP_DIR" | ||||
| } | ||||
|  | ||||
| @@ -61,8 +62,14 @@ _check_if_is_ip() | ||||
|  | ||||
| _setup_crypto_stuff | ||||
|  | ||||
| echo "Preparing dcarrillo/php" | ||||
| docker run --name php --rm -d dcarrillo/php > /dev/null | ||||
| docker exec -i php sh -c "echo 'pm.status_path = /phpfpm_status' \ | ||||
|                          >> /usr/local/etc/php-fpm.d/www.conf \ | ||||
|                          && kill -USR2 1" | ||||
|  | ||||
| echo "Running container to be tested..." | ||||
| docker run --name "${NGINX_VERSION}"_test --rm \ | ||||
| docker run --name "${NGINX_VERSION}"_test --rm --link php \ | ||||
|            -v "$LOCAL_DIR"/nginx.conf:/usr/local/nginx/conf/nginx.conf:ro \ | ||||
|            -v "$LOCAL_DIR"/GeoLite2-Country.mmdb:/tmp/GeoLite2-Country.mmdb:ro \ | ||||
|            -v "$TMP_DIR"/cert.pem:/tmp/cert.pem:ro \ | ||||
| @@ -76,8 +83,14 @@ docker run --name "${NGINX_VERSION}"_requester --rm --link "${NGINX_VERSION}"_te | ||||
| exec_docker="docker exec -i ${NGINX_VERSION}_requester" | ||||
| $exec_docker apk add curl > /dev/null | ||||
|  | ||||
| ## Test 1 status code by protocol | ||||
| for request in http://${NGINX_VERSION}_test/nginx_status https://${NGINX_VERSION}_test/nginx_status; do | ||||
| ## Test 1-4 http/https/fastcgipass | ||||
| requests=" | ||||
| http://${NGINX_VERSION}_test/nginx_status | ||||
| https://${NGINX_VERSION}_test/nginx_status | ||||
| http://${NGINX_VERSION}_test/phpfpm_status | ||||
| https://${NGINX_VERSION}_test/phpfpm_status | ||||
| " | ||||
| for request in $requests; do | ||||
|     printf "\nRequesting %s\n" "$request" | ||||
|     STATUS_CODE=$($exec_docker curl -s -k -m 5 -o /dev/null -w "%{http_code}" "$request") | ||||
|     _check_status_code "$STATUS_CODE" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user