Skip to content

Commit 39744ba

Browse files
authored
Images: Fix LuaRocks. (#13478)
1 parent 4eaa8bf commit 39744ba

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

images/e2e-test-echo/EXTRAARGS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
--build-arg LUAROCKS_VERSION=3.8.0 --build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7
1+
--build-arg LUAROCKS_VERSION=418d2ab34891b130cc317df32f65f978640febcf --build-arg LUAROCKS_SHA=5466eb5663620ef292090148adf1ab53a4fb2ff93780dca3e49f05c92d4d3a38

images/e2e-test-echo/rootfs/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ ARG BASE_IMAGE
22

33
FROM ${BASE_IMAGE}
44

5-
RUN apk update && apk upgrade && apk add -U --no-cache perl curl make unzip
5+
RUN apk update && apk upgrade && apk add -U --no-cache perl curl make unzip wget
66

77
ARG LUAROCKS_VERSION
88
ARG LUAROCKS_SHA
99

1010
RUN wget -O /tmp/luarocks.tgz \
11-
https://github.com/luarocks/luarocks/archive/v${LUAROCKS_VERSION}.tar.gz \
11+
https://github.com/luarocks/luarocks/archive/${LUAROCKS_VERSION}.tar.gz \
1212
&& echo "${LUAROCKS_SHA} */tmp/luarocks.tgz" | sha256sum -c - \
1313
&& tar -C /tmp -xzf /tmp/luarocks.tgz \
1414
&& cd /tmp/luarocks* \
@@ -17,4 +17,4 @@ RUN wget -O /tmp/luarocks.tgz \
1717

1818
RUN luarocks install lua-resty-template
1919

20-
COPY nginx.conf /etc/nginx/nginx.conf
20+
COPY nginx.conf /etc/nginx/nginx.conf

images/test-runner/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ build: builder
3838
--build-arg K8S_RELEASE=v1.33.1 \
3939
--build-arg RESTY_CLI_VERSION=0.27 \
4040
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
41-
--build-arg LUAROCKS_VERSION=3.8.0 \
42-
--build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7 \
41+
--build-arg LUAROCKS_VERSION=418d2ab34891b130cc317df32f65f978640febcf \
42+
--build-arg LUAROCKS_SHA=5466eb5663620ef292090148adf1ab53a4fb2ff93780dca3e49f05c92d4d3a38 \
4343
--build-arg CHART_TESTING_VERSION=3.8.0 \
4444
--build-arg YAML_LINT_VERSION=1.33.0 \
4545
--build-arg YAMALE_VERSION=4.0.4 \

images/test-runner/rootfs/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ RUN wget -qO /tmp/resty_cli.tgz \
8181
&& rm -rf /tmp/*
8282

8383
RUN wget -qO /tmp/luarocks.tgz \
84-
https://github.com/luarocks/luarocks/archive/v${LUAROCKS_VERSION}.tar.gz \
84+
https://github.com/luarocks/luarocks/archive/${LUAROCKS_VERSION}.tar.gz \
8585
&& echo "${LUAROCKS_SHA} */tmp/luarocks.tgz" | sha256sum -c - \
8686
&& tar -C /tmp -xzf /tmp/luarocks.tgz \
8787
&& cd /tmp/luarocks* \

0 commit comments

Comments
 (0)