diff --git a/hack/init-buildx.sh b/hack/init-buildx.sh index a24b64956..379173cf8 100755 --- a/hack/init-buildx.sh +++ b/hack/init-buildx.sh @@ -46,7 +46,9 @@ fi # We only need to do this setup on linux hosts if [ "$(uname)" == 'Linux' ]; then # NOTE: this is pinned to a digest for a reason! - docker run --rm --privileged multiarch/qemu-user-static@sha256:28ebe2e48220ae8fd5d04bb2c847293b24d7fbfad84f0b970246e0a4efd48ad6 --reset -p yes + # Note2 (@rikatz) - Removing the pin, as apparently it's breaking new alpine builds + # docker run --rm --privileged multiarch/qemu-user-static@sha256:28ebe2e48220ae8fd5d04bb2c847293b24d7fbfad84f0b970246e0a4efd48ad6 --reset -p yes + docker run --rm --privileged multiarch/qemu-user-static:register --reset -p yes fi # Ensure we use a builder that can leverage it (the default on linux will not) diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile index 676083bf8..85bea7e62 100644 --- a/images/nginx/rootfs/Dockerfile +++ b/images/nginx/rootfs/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. -FROM alpine:3.14.1 as builder +FROM alpine:3.14.2 as builder COPY . / @@ -23,7 +23,7 @@ RUN apk update \ && /build.sh # Use a multi-stage build -FROM alpine:3.14.1 +FROM alpine:3.14.2 ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin