Skip to content

Commit 19c6c19

Browse files
committed
saner
1 parent e93e3f3 commit 19c6c19

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Github/Runners/archlinux-builder.dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@ RUN <<EOS
88
#Base
99
set +e
1010
pacman -Syu --noconfirm
11-
pacman base-devel bash bison ca-certificates coreutils curl dos2unix findutils gettext git gnupg gperf imagemagick jq less lzip lzlib moreutils micro nano ncdu pacutils p7zip rsync sudo texinfo tmux unzip util-linux wget xz zip --sync --noconfirm || true
11+
packages="base-devel bash bison ca-certificates coreutils curl dos2unix findutils gettext git gnupg gperf imagemagick jq less lzip lzlib moreutils micro nano ncdu pacutils p7zip rsync sudo texinfo tmux unzip util-linux wget xz zip"
12+
for pkg in $packages; do pacman "$pkg" --sync --noconfirm ; done
1213
#RE
1314
pacman -Syu --noconfirm
1415
pacman base-devel bash bison ca-certificates coreutils curl dos2unix findutils gettext git gnupg gperf imagemagick jq less lzip lzlib moreutils micro nano ncdu pacutils p7zip rsync sudo texinfo tmux unzip util-linux wget xz zip --sync --needed --noconfirm || true
1516
#NetTools
16-
pacman inetutils iproute2 iputils net-tools openbsd-netcat --sync --needed --noconfirm || true
17+
packages="inetutils iproute2 iputils net-tools openbsd-netcat"
18+
for pkg in $packages; do pacman "$pkg" --sync --noconfirm ; done
1719
setcap 'cap_net_raw+ep' "$(which ping)"
1820
#Python & Deps
19-
pacman patchelf python python-devtools python-distro python-lxml python-netifaces python-pypatchelf python-pip python-pipx python-pkgconfig python-xxhash scons sysfsutils virt-what --sync --needed --noconfirm || true
21+
packages="patchelf python python-devtools python-distro python-lxml python-netifaces python-pypatchelf python-pip python-pipx python-pkgconfig python-xxhash scons sysfsutils virt-what"
22+
for pkg in $packages; do pacman "$pkg" --sync --needed --noconfirm ; done
2023
#Test
2124
python --version 2>/dev/null ; python3 --version 2>/dev/null || true
2225
pip --version 2>/dev/null ; pip3 --version 2>/dev/null || true
@@ -101,7 +104,8 @@ RUN <<EOS
101104
##Main
102105
set +e
103106
pacman -Syu --noconfirm || true
104-
pacman aria2 autoconf autoconf-archive automake bazel bc binutils b3sum brotli busybox ccache clang cmake coreutils cython diffutils dos2unix findutils fontconfig gawk gcc gettext kernel-headers-musl jq libpcap libtool meson musl nasm polkit pkgconf rsync spirv-headers spirv-tools sqlite texinfo texi2html util-linux util-linux-libs wget libxslt xxhash yasm --sync --needed --noconfirm || true
107+
packages="aria2 autoconf autoconf-archive automake bazel bc binutils b3sum brotli busybox ccache clang cmake coreutils cython diffutils dos2unix findutils fontconfig gawk gcc gettext kernel-headers-musl jq libpcap libtool meson musl nasm polkit pkgconf rsync spirv-headers spirv-tools sqlite texinfo texi2html util-linux util-linux-libs wget libxslt xxhash yasm"
108+
for pkg in $packages; do pacman "$pkg" --sync --needed --noconfirm ; done
105109
#Re
106110
pacman -Syu --noconfirm || true
107111
pacman aria2 autoconf autoconf-archive automake bazel bc binutils b3sum brotli busybox ccache clang cmake coreutils cython diffutils dos2unix findutils fontconfig gawk gcc gettext kernel-headers-musl jq libpcap libtool meson musl nasm polkit pkgconf rsync spirv-headers spirv-tools sqlite texinfo texi2html util-linux util-linux-libs wget libxslt xxhash yasm --sync --needed --noconfirm || true

0 commit comments

Comments
 (0)