Merge pull request #1563 from tkan145/update-ci-to-1.21.4-4-branch-2.16

Update ci to 1.21.4 4 branch 2.16

Author: tkan145

.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-2
+      - image: quay.io/3scale/apicast-ci:openresty-1.21.4-4
       - image: mirror.gcr.io/library/redis
     environment:
       TEST_NGINX_BINARY: openresty

Dockerfile.devel

@@ -1,9 +1,9 @@
 FROM registry.access.redhat.com/ubi8:8.5
 
 ARG OPENRESTY_RPM_VERSION="1.21.4-1.el8"
-ARG LUAROCKS_VERSION="3.11.1"
+ARG LUAROCKS_VERSION="3.12.0"
 ARG JAEGERTRACING_CPP_CLIENT_RPM_VERSION="0.3.1-13.el8"
-ARG LUAROVER_VERSION="0.2.1"
+ARG LUAROVER_VERSION="0.2.3"
 
 WORKDIR /tmp
 

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-1
+DEVEL_IMAGE ?= quay.io/3scale/apicast-ci:openresty-1.21.4-4
 DEVEL_DOCKERFILE ?= Dockerfile.devel
 
 RUNTIME_IMAGE ?= quay.io/3scale/apicast:latest
@@ -70,7 +70,7 @@ export COMPOSE_PROJECT_NAME
 # * update .circleci/config.yaml openresty executor with the image URL
 .PHONY: dev-build
 dev-build: export OPENRESTY_RPM_VERSION?=1.21.4
-dev-build: export LUAROCKS_VERSION?=3.11.1
+dev-build: export LUAROCKS_VERSION?=3.12.0
 dev-build: IMAGE_NAME ?= apicast-development:latest
 dev-build: ## Build development image
 	$(DOCKER) build --platform linux/amd64 -t $(IMAGE_NAME) \

docker-compose-devel.yml

@@ -2,7 +2,7 @@
 version: '2.2'
 services:
   development:
-    image: ${IMAGE:-quay.io/3scale/apicast-ci:openresty-1.21.4-2}
+    image: ${IMAGE:-quay.io/3scale/apicast-ci:openresty-1.21.4-4}
     platform: "linux/amd64"
     depends_on:
       - redis