From 0f0d704275689f333955dfc0070580f7e61cb247 Mon Sep 17 00:00:00 2001 From: Jan Dubois Date: Wed, 5 Jun 2024 16:57:27 -0700 Subject: [PATCH] Switch to openresty-0.0.5 It should be identical to 0.0.2, but has been build on top of Alpine 3.20 and includes the pubkey used to sign the packages, so they are not longer untrusted. Signed-off-by: Jan Dubois --- files/build.sh | 3 ++- versions.env | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/files/build.sh b/files/build.sh index 7ae701f..8a36a4b 100644 --- a/files/build.sh +++ b/files/build.sh @@ -111,7 +111,8 @@ apk --root /distro add containerd-ctr # needed to copy files to the host apk --root /distro add mkcert --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing # add openresty with http-proxy-connect module for the image-allow-list feature -apk --root /distro add --allow-untrusted --force-non-repository /openresty/x86_64/*.apk +cp /openresty/rd-openresty-*.pub /distro/etc/apk/keys +apk --root /distro add --force-non-repository /openresty/x86_64/*.apk # Override iptables to support older kernels cp /iptables-stub /distro/usr/local/bin/iptables-stub diff --git a/versions.env b/versions.env index 0fecb93..306bd1c 100644 --- a/versions.env +++ b/versions.env @@ -7,6 +7,6 @@ RD_NETWORKING_VERSION=v1.2.6 NERDCTL_REPO=containerd/nerdctl NERDCTL_VERSION=v1.7.6 OPENRESTY_REPO=rancher-sandbox/openresty-packaging -OPENRESTY_VERSION=v0.0.2 +OPENRESTY_VERSION=v0.0.5 CRI_DOCKERD_REPO=Mirantis/cri-dockerd CRI_DOCKERD_VERSION=v0.3.14