From 63f190010857bfb9a95f6762a39ea2b8438f22a2 Mon Sep 17 00:00:00 2001
From: An Tran <tkan145@gmail.com>
Date: Fri, 10 Jul 2026 12:46:58 +1000
Subject: [PATCH] Bump openresty to 1.21.4-4

This version includes serveral nginx security patches
---
 .circleci/config.yml | 2 +-
 Dockerfile           | 2 +-
 Dockerfile.devel     | 2 +-
 Makefile             | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2fce4fb87..4ebbfa5e9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -105,7 +105,7 @@ executors:
   openresty:
     working_directory: /opt/app-root/apicast
     docker:
-      - image: quay.io/3scale/apicast-ci:openresty-1.21.4-4
+      - image: quay.io/3scale/apicast-ci:openresty-1.21.4-6
       - image: mirror.gcr.io/library/redis
     environment:
       TEST_NGINX_BINARY: openresty
diff --git a/Dockerfile b/Dockerfile
index febc053ae..b9607dacb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8:8.5
 
-ARG OPENRESTY_RPM_VERSION="1.21.4-1.el8"
+ARG OPENRESTY_RPM_VERSION="1.21.4-4.el8"
 ARG LUAROCKS_VERSION="3.11.1"
 ARG JAEGERTRACING_CPP_CLIENT_RPM_VERSION="0.3.1-13.el8"
 
diff --git a/Dockerfile.devel b/Dockerfile.devel
index 97627e9be..6b37f629c 100644
--- a/Dockerfile.devel
+++ b/Dockerfile.devel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8:8.5
 
-ARG OPENRESTY_RPM_VERSION="1.21.4-1.el8"
+ARG OPENRESTY_RPM_VERSION="1.21.4-4.el8"
 ARG LUAROCKS_VERSION="3.12.0"
 ARG JAEGERTRACING_CPP_CLIENT_RPM_VERSION="0.3.1-13.el8"
 ARG LUAROVER_VERSION="0.2.3"
diff --git a/Makefile b/Makefile
index bcbcb5282..832b7335b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ NPROC ?= $(firstword $(shell nproc 2>/dev/null) 1)
 
 SEPARATOR="\n=============================================\n"
 
-DEVEL_IMAGE ?= quay.io/3scale/apicast-ci:openresty-1.21.4-4
+DEVEL_IMAGE ?= quay.io/3scale/apicast-ci:openresty-1.21.4-6
 DEVEL_DOCKERFILE ?= Dockerfile.devel
 
 RUNTIME_IMAGE ?= quay.io/3scale/apicast:latest
@@ -69,7 +69,7 @@ export COMPOSE_PROJECT_NAME
 #     docker push quay.io/3scale/apicast-ci:openresty-X.Y.Z-{release_number}
 # * update .circleci/config.yaml openresty executor with the image URL
 .PHONY: dev-build
-dev-build: export OPENRESTY_RPM_VERSION?=1.21.4-1.el8
+dev-build: export OPENRESTY_RPM_VERSION?=1.21.4-4.el8
 dev-build: export LUAROCKS_VERSION?=3.12.0
 dev-build: IMAGE_NAME ?= apicast-development:latest
 dev-build: ## Build development image