Merge branch 'master' of ssh://code.fleshless.org:2290/Spark/spark-rootfs

Signed-off-by: fbt <fbt@fleshless.org>

Containerfile

@@ -1,16 +1,17 @@
 FROM localhost/archlinux:fullbase
-RUN pacman -Sy --noconfirm archlinux-keyring
-RUN pacman -Suy --noconfirm
 
 COPY root/etc /etc
 COPY builder.pgp.pub /
 
+RUN pacman --disable-sandbox -Sy --noconfirm archlinux-keyring
+RUN pacman --disable-sandbox -Suy --noconfirm
+
 RUN pacman-key -a /builder.pgp.pub
 RUN rm -vf /builder.pgp.pub /etc/os-release
 
-RUN pacman -Sy
-RUN pacman -Rdd --noconfirm systemd systemd-libs systemd-sysvcompat base
-RUN pacman -S --noconfirm halt-ubase-git sinit-spark sinit-sysvcompat sinit-tools spark-etc spark-rc ssm ssm-service ssm-services-git systemd-dummy udev-dummy systemd-libs-systemd systemd-libs-udev
+RUN pacman --disable-sandbox -Sy
+RUN pacman --disable-sandbox -Rdd --noconfirm systemd systemd-libs systemd-sysvcompat base
+RUN pacman --disable-sandbox -S --noconfirm halt-ubase-git sinit-spark sinit-sysvcompat sinit-tools spark-etc spark-rc ssm ssm-service ssm-services-git systemd-dummy udev-dummy systemd-libs-systemd systemd-libs-udev
 
 RUN rm -vf /var/cache/pacman/pkg/*
-RUN pacman -Scc --noconfirm
+RUN pacman --disable-sandbox -Scc --noconfirm

build-rootfs

@@ -1,14 +1,14 @@
-#!/usr/bin/env bash
-
-workdir="${DESTDIR:-$HOME/public/rootfs}"
-filename="spark-x86_64-$(date '+%Y%m%d').tar.zst"
-
-cd "$workdir"
-
-podman create --name spark-rootfs localhost/spark:latest bash
-podman export spark-rootfs | zstd > ".$filename.part"
-podman rm spark-rootfs
-
-mv ".$filename.part" "$filename"
-
-[[ -f ./switch ]] && ./switch "$filename"
+#!/usr/bin/env bash
+
+workdir="${DESTDIR:-$HOME/public/rootfs}"
+filename="spark-x86_64-$(date '+%Y%m%d').tar.zst"
+
+cd "$workdir"
+
+podman create --name spark-rootfs localhost/spark:latest bash
+podman export spark-rootfs | zstd > ".$filename.part"
+podman rm spark-rootfs
+
+mv ".$filename.part" "$filename"
+
+[[ -f ./switch ]] && ./switch "$filename"

root/etc/pacman.conf

@@ -33,7 +33,11 @@ Architecture = auto
 #Color
 #TotalDownload
 CheckSpace
-#VerbosePkgLists
+VerbosePkgLists
+ParallelDownloads = 5
+DownloadUser = alpm
+#DisableSandboxFilesystem
+#DisableSandboxSyscalls
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -83,8 +87,8 @@ Include = /etc/pacman.d/mirrorlist
 #[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[community]
-Include = /etc/pacman.d/mirrorlist
+#[community]
+#Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repositories as required here.