summaryrefslogtreecommitdiffstats
path: root/molecule
diff options
context:
space:
mode:
Diffstat (limited to 'molecule')
-rw-r--r--molecule/archlinux/Dockerfile.j218
1 files changed, 8 insertions, 10 deletions
diff --git a/molecule/archlinux/Dockerfile.j2 b/molecule/archlinux/Dockerfile.j2
index fd6791e7..907fb7c1 100644
--- a/molecule/archlinux/Dockerfile.j2
+++ b/molecule/archlinux/Dockerfile.j2
@@ -2,13 +2,14 @@ FROM docker.io/library/archlinux
ENV container docker
-# pacman's syscall sandbox (alpm) doesn't work under QEMU user-mode
-# emulation (e.g. building amd64 images on an arm64 host): the sandbox's
-# seccomp filter needs syscalls QEMU doesn't emulate, so pacman fails
-# with "error restricting syscalls via seccomp" before ever reaching the
-# network. Disabling it only affects local cross-arch testing; native
-# CI runners aren't emulated and are unaffected either way.
-RUN sed -i '/^\[options\]/a DisableSandbox' /etc/pacman.conf
+# pacman's syscall sandbox doesn't work under QEMU user-mode emulation
+# (e.g. building amd64 images on an arm64 host): its seccomp filter needs
+# syscalls QEMU doesn't emulate, so pacman fails with "error restricting
+# syscalls via seccomp" before ever reaching the network. Only the syscall
+# sandbox is disabled here, not the whole sandbox (DisableSandbox), which
+# is unnecessarily broad. Native (non-emulated) CI runners never hit the
+# syscall sandbox failure and are unaffected by this either way.
+RUN sed -i '/^\[options\]/a DisableSandboxSyscalls' /etc/pacman.conf
RUN pacman -Syu --noconfirm --needed python3 systemd udev dbus \
&& pacman -Scc --noconfirm
@@ -17,9 +18,6 @@ RUN pacman -Syu --noconfirm --needed python3 systemd udev dbus \
# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/issues/59
RUN cp -r /usr/share/i18n/locales/en_US /usr/share/i18n/locales/de_DE;
-# Workaround getting failed ssl issues randomly in local testing
-RUN sed -i '/^\[options\]/a XferCommand = /usr/bin/curl --retry 5 --retry-delay 2 -L -C - -f -o %o %u' /etc/pacman.conf
-
VOLUME ["/sys/fs/cgroup"]
CMD ["/lib/systemd/systemd"]