Add 1.27, update uploadprogress

.github/workflows/workflow.yml

@@ -14,6 +14,19 @@ env:
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
+  nginx-127:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: docker/setup-qemu-action@v3
+      with:
+        platforms: amd64,arm64
+    - uses: docker/setup-buildx-action@v3
+    - uses: ./.github/actions
+      with:
+        version: '1.27.0'
+        tags: 1.27,1,latest
+        platform: linux/amd64,linux/arm64
   nginx-126:
     runs-on: ubuntu-latest
     steps:
@@ -25,7 +38,7 @@ jobs:
     - uses: ./.github/actions
       with:
         version: '1.26.1'
-        tags: 1.26,1,latest
+        tags: '1.26'
         platform: linux/amd64,linux/arm64
   nginx-125:
     runs-on: ubuntu-latest

Dockerfile

@@ -12,8 +12,6 @@ ENV NGINX_VER="${NGINX_VER}" \
     FILES_DIR="/mnt/files" \
     NGINX_VHOST_PRESET="html"
 
-COPY patches /tmp/patches
-
 RUN set -ex; \
     \
     nginx_up_ver="0.9.1"; \
@@ -112,15 +110,12 @@ RUN set -ex; \
     mv rules /etc/nginx/modsecurity/crs; \
     \
     # Get ngx upload progress module. \
-    mkdir -p /tmp/ngx_http_uploadprogress_module; \
-    url="https://github.com/masterzen/nginx-upload-progress-module/archive/v${nginx_up_ver}.tar.gz"; \
-    wget -qO- "${url}" | tar xz --strip-components=1 -C /tmp/ngx_http_uploadprogress_module; \
-    if [[ -d "/tmp/patches/${NGINX_VER%.*}" ]]; then \
-        cd /tmp/ngx_http_uploadprogress_module; \
-        patch -p1 -i "/tmp/patches/${NGINX_VER%.*}/uploadprogress.patch"; \
-    fi; \
-    \
-    export GPG_KEYS=43387825DDB1BB97EC36BA5D007C8D7C15D87369; \
+    cd /tmp; \
+    git clone https://github.com/masterzen/nginx-upload-progress-module ngx_http_uploadprogress_module; \
+    cd ngx_http_uploadprogress_module; \
+    git reset --hard 85e1e8dcfbc7df73757603e3bda627ec93aff0a8; \
+    \
+    export GPG_KEYS=D6786CE303D9A9022998DC6CC8464D549AF75C0A; \
     # Get VTS module \
     git clone https://github.com/vozlt/nginx-module-vts.git /tmp/nginx_module_vts; \
     cd /tmp/nginx_module_vts; \

Makefile

@@ -1,6 +1,6 @@
 -include env_make
 
-NGINX_VER ?= 1.26.1
+NGINX_VER ?= 1.27.0
 NGINX_MINOR_VER ?= $(shell echo "${NGINX_VER}" | grep -oE '^[0-9]+\.[0-9]+')
 
 TAG ?= $(NGINX_MINOR_VER)

README.md

@@ -38,7 +38,8 @@ Overview:
 
 Supported tags and respective `Dockerfile` links:
 
-- `1.26`, `1`, `latest` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile)
+- `1.27`, `1`, `latest` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile)
+- `1.26` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile)
 - `1.25` [_(Dockerfile)_](https://github.com/wodby/nginx/tree/master/Dockerfile)
 
 All images built for `linux/amd64` and `linux/arm64`