From f56d8329436b3dc3fd1cf411193acb8c6d03f5ac Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Fri, 22 Jan 2021 15:25:47 +0000 Subject: [PATCH] test images: Fixes apparmor-loader image Currently, the image is not working properly because of the apparmor_parser giving this error: Error relocating /sbin/apparmor_parser: secure_getenv: symbol not found Updating musl to 1.1.20 or newer will fix this problem. --- test/images/apparmor-loader/Dockerfile | 3 ++- test/images/apparmor-loader/VERSION | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/images/apparmor-loader/Dockerfile b/test/images/apparmor-loader/Dockerfile index c6e38ae7e75..8292205133c 100644 --- a/test/images/apparmor-loader/Dockerfile +++ b/test/images/apparmor-loader/Dockerfile @@ -17,7 +17,8 @@ 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 +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/ ADD loader /usr/bin/loader diff --git a/test/images/apparmor-loader/VERSION b/test/images/apparmor-loader/VERSION index 5625e59da88..7e32cd56983 100644 --- a/test/images/apparmor-loader/VERSION +++ b/test/images/apparmor-loader/VERSION @@ -1 +1 @@ -1.2 +1.3