Merge pull request #103 from rancher-sandbox/openresty-0.0.3

Switch to openresty-0.0.5
rancher-sandbox · Jun 27, 2024 · 5e94b88 · 5e94b88
2 parents 2c70f02 + 0f0d704
commit 5e94b88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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