From 84a9773cec33cf916789b5b754fc21b2465fcadf Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Wed, 29 May 2024 09:20:39 +0000 Subject: [PATCH] ci: initramfs no sudo BUild initramfs without sudo docker this is not needed. This is part 10 of N Signed-off-by: Zvonko Kaiser --- tools/packaging/static-build/initramfs/Dockerfile | 2 +- tools/packaging/static-build/initramfs/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/packaging/static-build/initramfs/Dockerfile b/tools/packaging/static-build/initramfs/Dockerfile index 9ba6968c2..ebb2afc11 100644 --- a/tools/packaging/static-build/initramfs/Dockerfile +++ b/tools/packaging/static-build/initramfs/Dockerfile @@ -1,7 +1,7 @@ # Copyright (c) 2022 Intel Corporation # # SPDX-License-Identifier: Apache-2.0 -from ubuntu:20.04 +FROM ubuntu:20.04 ARG DEBIAN_FRONTEND=noninteractive ARG cryptsetup_repo=${cryptsetup_repo} diff --git a/tools/packaging/static-build/initramfs/build.sh b/tools/packaging/static-build/initramfs/build.sh index 065520ff7..2ac741ede 100755 --- a/tools/packaging/static-build/initramfs/build.sh +++ b/tools/packaging/static-build/initramfs/build.sh @@ -34,7 +34,7 @@ package_output_dir="${package_output_dir:-}" container_image="${BUILDER_REGISTRY}:initramfs-cryptsetup-${cryptsetup_version}-lvm2-${lvm2_version}-$(get_last_modification ${repo_root_dir} ${script_dir})-$(uname -m)" -sudo docker pull ${container_image} || (sudo docker build \ +docker pull ${container_image} || (docker build \ --build-arg cryptsetup_repo="${cryptsetup_repo}" \ --build-arg cryptsetup_version="${cryptsetup_version}" \ --build-arg lvm2_repo="${lvm2_repo}" \ @@ -43,7 +43,7 @@ sudo docker pull ${container_image} || (sudo docker build \ # No-op unless PUSH_TO_REGISTRY is exported as "yes" push_to_registry "${container_image}") -sudo docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \ +docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \ -w "${PWD}" \ "${container_image}" \ bash -c "${initramfs_builder} ${default_install_dir}"