From bb4d8149318c8fe23f1dbe264f70be0b7b46bfc7 Mon Sep 17 00:00:00 2001
From: Marco Ebert <marco_ebert@icloud.com>
Date: Thu, 5 Jun 2025 15:12:40 +0200
Subject: [PATCH] Images: Fix LuaRocks. (#13477)

---
 images/e2e-test-echo/EXTRAARGS         | 2 +-
 images/e2e-test-echo/rootfs/Dockerfile | 6 +++---
 images/test-runner/Makefile            | 4 ++--
 images/test-runner/rootfs/Dockerfile   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/images/e2e-test-echo/EXTRAARGS b/images/e2e-test-echo/EXTRAARGS
index 3db8aaa5c..4f51ce9e5 100644
--- a/images/e2e-test-echo/EXTRAARGS
+++ b/images/e2e-test-echo/EXTRAARGS
@@ -1 +1 @@
---build-arg LUAROCKS_VERSION=3.8.0 --build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7
\ No newline at end of file
+--build-arg LUAROCKS_VERSION=418d2ab34891b130cc317df32f65f978640febcf --build-arg LUAROCKS_SHA=5466eb5663620ef292090148adf1ab53a4fb2ff93780dca3e49f05c92d4d3a38
diff --git a/images/e2e-test-echo/rootfs/Dockerfile b/images/e2e-test-echo/rootfs/Dockerfile
index eaa919835..f35974a0a 100644
--- a/images/e2e-test-echo/rootfs/Dockerfile
+++ b/images/e2e-test-echo/rootfs/Dockerfile
@@ -2,13 +2,13 @@ ARG BASE_IMAGE
 
 FROM ${BASE_IMAGE}
 
-RUN apk update && apk upgrade && apk add -U --no-cache perl curl make unzip
+RUN apk update && apk upgrade && apk add -U --no-cache perl curl make unzip wget
 
 ARG LUAROCKS_VERSION
 ARG LUAROCKS_SHA
 
 RUN wget -O /tmp/luarocks.tgz \
-  https://github.com/luarocks/luarocks/archive/v${LUAROCKS_VERSION}.tar.gz \
+  https://github.com/luarocks/luarocks/archive/${LUAROCKS_VERSION}.tar.gz \
   && echo "${LUAROCKS_SHA} */tmp/luarocks.tgz" | sha256sum -c - \
   && tar -C /tmp -xzf /tmp/luarocks.tgz \
   && cd /tmp/luarocks* \
@@ -17,4 +17,4 @@ RUN wget -O /tmp/luarocks.tgz \
 
 RUN luarocks install lua-resty-template
 
-COPY nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile
index 5556e7544..4d10a1717 100644
--- a/images/test-runner/Makefile
+++ b/images/test-runner/Makefile
@@ -38,8 +38,8 @@ build: builder
 		--build-arg K8S_RELEASE=v1.33.1 \
 		--build-arg RESTY_CLI_VERSION=0.27 \
 		--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
-		--build-arg LUAROCKS_VERSION=3.8.0 \
-		--build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7 \
+		--build-arg LUAROCKS_VERSION=418d2ab34891b130cc317df32f65f978640febcf \
+		--build-arg LUAROCKS_SHA=5466eb5663620ef292090148adf1ab53a4fb2ff93780dca3e49f05c92d4d3a38 \
 		--build-arg CHART_TESTING_VERSION=3.8.0 \
 		--build-arg YAML_LINT_VERSION=1.33.0 \
 		--build-arg YAMALE_VERSION=4.0.4 \
diff --git a/images/test-runner/rootfs/Dockerfile b/images/test-runner/rootfs/Dockerfile
index 69fae92d7..1d2fa1320 100644
--- a/images/test-runner/rootfs/Dockerfile
+++ b/images/test-runner/rootfs/Dockerfile
@@ -81,7 +81,7 @@ RUN wget -qO /tmp/resty_cli.tgz \
   && rm -rf /tmp/*
 
 RUN wget -qO /tmp/luarocks.tgz \
-  https://github.com/luarocks/luarocks/archive/v${LUAROCKS_VERSION}.tar.gz \
+  https://github.com/luarocks/luarocks/archive/${LUAROCKS_VERSION}.tar.gz \
   && echo "${LUAROCKS_SHA} */tmp/luarocks.tgz" | sha256sum -c - \
   && tar -C /tmp -xzf /tmp/luarocks.tgz \
   && cd /tmp/luarocks* \