diff --git a/docker/Dockerfile b/docker/Dockerfile index 63703229..ad0ad8a4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM rockylinux:9 LABEL maintainer="Kleis Auke Wolthuizen " -ARG NGINX_VERSION=1.25.4 +ARG NGINX_VERSION=1.27.0 # Copy the contents of this repository to the container COPY . /var/www/imagesweserv diff --git a/docker/README.md b/docker/README.md index 3cefbfb6..2b6eefe6 100644 --- a/docker/README.md +++ b/docker/README.md @@ -18,7 +18,7 @@ This document describes how to use weserv/images with Docker. 1. Build the container (with a specified nginx version). ```bash - docker build --build-arg NGINX_VERSION=1.25.4 -t weserv/images -f docker/Dockerfile . + docker build --build-arg NGINX_VERSION=1.27.0 -t weserv/images -f docker/Dockerfile . ``` 2. Run the container (same as above, but using the recently built tag). diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile index 98f7140e..adc093b9 100644 --- a/docker/alpine.Dockerfile +++ b/docker/alpine.Dockerfile @@ -5,13 +5,13 @@ FROM alpine:3.19 LABEL maintainer="Kleis Auke Wolthuizen " -ARG NGINX_VERSION=1.25.4 +ARG NGINX_VERSION=1.27.0 # Copy the contents of this repository to the container COPY . /var/www/imagesweserv WORKDIR /var/www/imagesweserv -# Create nginx user/group first, to be consistent throughout docker variants +# Create nginx user/group RUN addgroup -g 101 -S nginx \ && adduser -S -D -H -u 101 -h /var/cache/nginx -s /sbin/nologin -G nginx -g nginx nginx \ # Bring in build dependencies diff --git a/third_party/nginx/CMakeLists.txt b/third_party/nginx/CMakeLists.txt index 94850776..488ab6d1 100644 --- a/third_party/nginx/CMakeLists.txt +++ b/third_party/nginx/CMakeLists.txt @@ -1,5 +1,5 @@ if (NOT NGX_VERSION) - set(NGX_VERSION 1.25.4) + set(NGX_VERSION 1.27.0) endif() set(NGX_ROOT ${CMAKE_CURRENT_BINARY_DIR})