dcarrillo/docker-nginx
1
0
Fork 0
mirror of https://github.com/dcarrillo/docker-nginx.git synced 2025-01-04 22:56:48 +00:00
Code Issues Releases Wiki Activity

Bump nginx to 1.26.1, Alpine to 3.19

Browse Source
This commit is contained in:
Daniel Carrillo 2024-06-08 17:20:54 +02:00
parent ac2cad9244
commit 97051249a9
Signed by: dcarrillo
GPG Key ID: E4CD5C09DAED6E16
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.18 FROM alpine:3.19
ARG ARG_NGINX_VERSION ARG ARG_NGINX_VERSION

2
conf.env
View File

@ -1,2 +1,2 @@
NGINX_VERSION=1.25.4 NGINX_VERSION=1.26.1
DOCKER_IMAGE=dcarrillo/nginx DOCKER_IMAGE=dcarrillo/nginx

6
tests/test.sh
View File

@ -10,7 +10,7 @@ fi
trap _catch_err ERR trap _catch_err ERR
trap _cleanup EXIT trap _cleanup EXIT
ALPINE_VERSION="alpine:3.16" ALPINE_VERSION="alpine:3.19"
LOCAL_DIR="$(cd "$(dirname "$0")" ; pwd -P)" LOCAL_DIR="$(cd "$(dirname "$0")" ; pwd -P)"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "$LOCAL_DIR"/../conf.env . "$LOCAL_DIR"/../conf.env
@ -52,8 +52,8 @@ _check_status_code()
_setup_crypto_stuff _setup_crypto_stuff
echo "Preparing dcarrillo/php" echo "Preparing php"
docker run --name php --rm -d dcarrillo/php > /dev/null docker run --name php --rm -d php:fpm-alpine > /dev/null
docker exec -i php sh -c "echo 'pm.status_path = /phpfpm_status' \ docker exec -i php sh -c "echo 'pm.status_path = /phpfpm_status' \
>> /usr/local/etc/php-fpm.d/www.conf \ >> /usr/local/etc/php-fpm.d/www.conf \
&& kill -USR2 1" && kill -USR2 1"