github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 02:11:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix build of apparmor-loader test image

Browse Source 
apparmor is no longer found in Alpine edge/testing but in
edge/community, presumably in preparation for full-fledged inclusion in
3.15.  If so, once that is released, BASEIMAGE can be updated again and
the explicit --repository flag to 'apk add' dropped.

Fixes: https://github.com/kubernetes/kubernetes/issues/105528
This commit is contained in:
Yaakov Selkowitz 2021-10-07 01:21:09 -04:00
parent a861de6d16
commit 82920d99f8
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/images/apparmor-loader/BASEIMAGE
View File

@ -1,4 +1,4 @@
linux/amd64=alpine:3.8
linux/arm=arm32v6/alpine:3.8
linux/arm64=arm64v8/alpine:3.8
linux/ppc64le=ppc64le/alpine:3.8
linux/amd64=alpine:3.14
linux/arm=arm32v6/alpine:3.14
linux/arm64=arm64v8/alpine:3.14
linux/ppc64le=ppc64le/alpine:3.14

3
test/images/apparmor-loader/Dockerfile
View File

@ -17,8 +17,7 @@ FROM $BASEIMAGE
CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
RUN apk add apparmor libapparmor --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted && \
apk add --no-cache musl\>1.1.20 --repository http://dl-cdn.alpinelinux.org/alpine/edge/main/
RUN apk add apparmor libapparmor --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted
ADD loader /usr/bin/loader