From 97051249a95c5a1ef33bf2075f6b8e0bf2612e63 Mon Sep 17 00:00:00 2001 From: Daniel Carrillo Date: Sat, 8 Jun 2024 17:20:54 +0200 Subject: [PATCH] Bump nginx to 1.26.1, Alpine to 3.19 --- Dockerfile | 2 +- conf.env | 2 +- tests/test.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 449266f..faae6e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 ARG ARG_NGINX_VERSION diff --git a/conf.env b/conf.env index c3e520b..c7ce882 100644 --- a/conf.env +++ b/conf.env @@ -1,2 +1,2 @@ -NGINX_VERSION=1.25.4 +NGINX_VERSION=1.26.1 DOCKER_IMAGE=dcarrillo/nginx diff --git a/tests/test.sh b/tests/test.sh index ec5cf8f..52693d3 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -10,7 +10,7 @@ fi trap _catch_err ERR trap _cleanup EXIT -ALPINE_VERSION="alpine:3.16" +ALPINE_VERSION="alpine:3.19" LOCAL_DIR="$(cd "$(dirname "$0")" ; pwd -P)" # shellcheck disable=SC1090 . "$LOCAL_DIR"/../conf.env @@ -52,8 +52,8 @@ _check_status_code() _setup_crypto_stuff -echo "Preparing dcarrillo/php" -docker run --name php --rm -d dcarrillo/php > /dev/null +echo "Preparing php" +docker run --name php --rm -d php:fpm-alpine > /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"