From 82920d99f8c87b6518f1521c504df9248157c94c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 7 Oct 2021 01:21:09 -0400 Subject: [PATCH] Fix build of apparmor-loader test image 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 --- test/images/apparmor-loader/BASEIMAGE | 8 ++++---- test/images/apparmor-loader/Dockerfile | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/images/apparmor-loader/BASEIMAGE b/test/images/apparmor-loader/BASEIMAGE index 8d99f110a96..033642b49c9 100644 --- a/test/images/apparmor-loader/BASEIMAGE +++ b/test/images/apparmor-loader/BASEIMAGE @@ -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 diff --git a/test/images/apparmor-loader/Dockerfile b/test/images/apparmor-loader/Dockerfile index 8292205133c..2a2aabfff6d 100644 --- a/test/images/apparmor-loader/Dockerfile +++ b/test/images/apparmor-loader/Dockerfile @@ -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