diff --git a/build_arch.sh b/build_arch.sh index 797fb38..7d78c10 100755 --- a/build_arch.sh +++ b/build_arch.sh @@ -18,7 +18,7 @@ EOF curl -s https://gitea.sebastian-tobie.de/api/packages/packete/arch/repository.key | buildah run --user 0:0 "archlinux" pacman-key -a - buildah run --user 0:0 archlinux pacman-key --lsign-key 'packete@noreply.gitea.sebastian-tobie.de' -buildah run --user 0:0 "archlinux" pacman --noconfirm -Syu nodejs git base-devel +buildah run --user 0:0 "archlinux" pacman --noconfirm -Syu nodejs git base-devel sudo arch_install "$container" "https://github.com/openbao/openbao/releases/download/v${openbao_version}/bao_${openbao_version}_linux_amd64.pkg.tar.zst" commit "archlinux" "oci:archlinux" du -sh archlinux diff --git a/build_debian.sh b/build_debian.sh index 0c707ee..f4bd41b 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -25,7 +25,7 @@ buildah run --user 0:0 "$container" apt install -y ca-certificates buildah copy "$container" "$debian_list" /etc/apt/sources.list.d/eigene.sources buildah run --user 0:0 "$container" apt update debian_selection "$container" selections.txt -buildah run --user 0:0 "$container" apt install -y build-essential nodejs git git-buildpackage ca-certificates-st +buildah run --user 0:0 "$container" apt install -y build-essential nodejs git git-buildpackage ca-certificates-st sudo debian_install "$container" "https://github.com/openbao/openbao/releases/download/v${openbao_version}/bao_${openbao_version}_linux_amd64.deb" commit "$container" "oci:debian:${version}" diff --git a/build_ubi.sh b/build_ubi.sh index a527bd7..ff83ade 100755 --- a/build_ubi.sh +++ b/build_ubi.sh @@ -22,7 +22,8 @@ ubi_install(){ } init_container "$container" "registry.access.redhat.com/ubi${version}:latest" -buildah run --user 0:0 "$container" dnf install -y nodejs git rpm-build +buildah run --user 0:0 "$container" dnf install -y nodejs git rpm-build sudo rpmdevtools ubi_install "$container" "https://github.com/openbao/openbao/releases/download/v${openbao_version}/bao_${openbao_version}_linux_amd64.rpm" + commit "$container" "oci:ubi:$version" du -sh ubi diff --git a/common.sh b/common.sh index 83b7ca2..e7b0de4 100644 --- a/common.sh +++ b/common.sh @@ -18,6 +18,8 @@ commit(){ buildah run --user 0:0 "$container" mkdir /src buildah run --user 0:0 "$container" useradd -M -u 1000 -U -d /src build buildah run --user 0:0 "$container" chown 1000:1000 /src + buildah copy --chmod 0700 --chown 0:0 "$container" sudoers /etc/sudoers.d/build + buildah run --user 0:0 "$container" git config --system --add safe.directory /src buildah unshare ./cleanup.sh "$container" buildah commit --rm -f oci --squash "$container" "$2" trap - EXIT diff --git a/copy.sh b/copy.sh index e2fd0e0..d2e42e3 100755 --- a/copy.sh +++ b/copy.sh @@ -6,3 +6,6 @@ skopeo copy --preserve-digests oci:debian:bookworm docker://gitea.sebastian-tobi skopeo copy --preserve-digests oci:ubi:9 docker://gitea.sebastian-tobie.de/docker/ubi:latest skopeo copy --preserve-digests oci:ubi:9 docker://gitea.sebastian-tobie.de/docker/ubi:9 skopeo copy --preserve-digests oci:ubi:9 docker://gitea.sebastian-tobie.de/docker/ubi:9-$number +skopeo copy --preserve-digests oci:archlinux containers-storage:gitea.sebastian-tobie.de/docker/archlinux:latest +skopeo copy --preserve-digests oci:debian:bookworm containers-storage:gitea.sebastian-tobie.de/docker/debian:bookworm +skopeo copy --preserve-digests oci:ubi:9 containers-storage:gitea.sebastian-tobie.de/docker/ubi:9 diff --git a/sudoers b/sudoers new file mode 100644 index 0000000..d05cd0d --- /dev/null +++ b/sudoers @@ -0,0 +1 @@ +build ALL =(root) NOPASSWD: ALL