DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update alpine and remove buildx restriction (#7583)

Browse source
This commit is contained in:
Ricardo Katz 2021-09-02 15:59:39 -03:00 committed by GitHub
parent 61c596bea6
commit cb8ebcb880
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hack/init-buildx.sh
View file

@ -46,7 +46,9 @@ fi
# We only need to do this setup on linux hosts # We only need to do this setup on linux hosts
if [ "$(uname)" == 'Linux' ]; then if [ "$(uname)" == 'Linux' ]; then
# NOTE: this is pinned to a digest for a reason! # 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 fi
# Ensure we use a builder that can leverage it (the default on linux will not) # Ensure we use a builder that can leverage it (the default on linux will not)

4
images/nginx/rootfs/Dockerfile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
FROM alpine:3.14.1 as builder FROM alpine:3.14.2 as builder
COPY . / COPY . /
@ -23,7 +23,7 @@ RUN apk update \
&& /build.sh && /build.sh
# Use a multi-stage build # 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 ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin