Skip to content

Commit ce4951f

Browse files
committed
Pin openresty versions
1 parent b66bb08 commit ce4951f

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

openid-connect-provider-debugger/Dockerfile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ HEALTHCHECK CMD ["/usr/bin/curl", "-i", "-s", "-S", "-f", "http://localhost"]
99

1010
COPY nginx.conf.patch /usr/local/openresty/nginx/conf/
1111

12-
# hadolint ignore=DL4006
12+
# hadolint ignore=DL3019
1313
RUN apk -U upgrade \
1414
&& apk add \
1515
curl=8.12.1-r0 \
@@ -18,9 +18,15 @@ RUN apk -U upgrade \
1818
apk -u list ; \
1919
exit 1 ; \
2020
fi \
21-
&& rm -rf /var/cache/apk/* \
22-
&& /usr/local/openresty/luajit/bin/luarocks install lua-resty-openidc --pin "${LUA_RESTY_OPENIDC_VERSION}" \
23-
&& patch /usr/local/openresty/nginx/conf/nginx.conf /usr/local/openresty/nginx/conf/nginx.conf.patch \
21+
&& rm -rf /var/cache/apk/*
22+
23+
RUN luarocks install lua-resty-openidc --pin "${LUA_RESTY_OPENIDC_VERSION}" \
24+
&& IFS=$'\n\t' if luarocks list --outdated | grep -q -e '^lua-resty-openidc$' ; then \
25+
luarocks list --outdated ; \
26+
exit 1 ; \
27+
fi
28+
29+
RUN patch /usr/local/openresty/nginx/conf/nginx.conf /usr/local/openresty/nginx/conf/nginx.conf.patch \
2430
&& rm -f /usr/local/openresty/nginx/conf/nginx.conf.patch
2531

2632
COPY default.conf /etc/nginx/conf.d/

openid-connect-provider-debugger/Dockerfile-test

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,8 @@ ARG USER_GECOS=Default
1111

1212
SHELL ["/bin/ash", "-euo", "pipefail", "-c"]
1313

14-
RUN apk -U upgrade \
15-
&& apk add \
16-
curl==8.12.1-r0 \
17-
&& if [[ $(apk -u list) ]] ; then \
18-
apk -u list ; \
19-
exit 1 ; \
20-
fi \
21-
&& rm -rf /var/cache/apk/*
14+
# hadolint ignore=DL3018
15+
RUN apk add --no-cache curl
2216

2317
RUN adduser \
2418
--home "${USER_HOME}" \

0 commit comments

Comments
 (0)