From d56256061bb5ee546718c8fd85103615663b484b Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sun, 3 Nov 2024 15:46:21 -0500 Subject: [PATCH] Add crypto-policies to image --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index be0bf5bd3..0a9fa026b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ ENV EFS_CLIENT_SOURCE=$client_source RUN OS=${TARGETOS} ARCH=${TARGETARCH} make $TARGETOS/$TARGETARCH -FROM public.ecr.aws/eks-distro-build-tooling/python:3.9-gcc-al2 as rpm-provider +FROM public.ecr.aws/eks-distro-build-tooling/python:3.9-gcc-al23 as rpm-provider # Install efs-utils from github by default. It can be overriden to `yum` with --build-arg when building the Docker image. # If value of `EFSUTILSSOURCE` build arg is overriden with `yum`, docker will install efs-utils from Amazon Linux 2's yum repo. @@ -38,7 +38,7 @@ RUN mkdir -p /tmp/rpms && \ then echo "Installing efs-utils from Amazon Linux 2 yum repo" && \ yum -y install --downloadonly --downloaddir=/tmp/rpms amazon-efs-utils-1.35.0-1.amzn2.noarch; \ else echo "Installing efs-utils from github using the latest git tag" && \ - yum -y install git rpm-build make openssl-devel curl && \ + yum -y install systemd git rpm-build make openssl-devel curl && \ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ source $HOME/.cargo/env && \ rustup update && \ @@ -62,6 +62,7 @@ COPY --from=rpm-provider /tmp/rpms/* /tmp/download/ # second param indicates to skip installing dependency rpms, these will be installed manually # cd, ls, cat, vim, tcpdump, are for debugging RUN clean_install amazon-efs-utils true && \ + clean_install crypto-policies true && \ install_binary \ /usr/bin/cat \ /usr/bin/cd \