bootstrap [releng]

3 files changed, 24 insertions, 4 deletions

diff --git a/bootstrap-arch32-trust b/bootstrap-arch32-trust
new file mode 100755
index 0000000..f8f630f
--- /dev/null
+++ b/bootstrap-arch32-trust
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+keyring=$(
+  curl -Ss 'https://mirror.archlinux32.org/x86_64/releng/' \
+  | tr '"' '\n' \
+  | grep '^archlinux32-keyring-.*-any\.pkg\.tar\.zst$' \
+  | grep -vwF transition \
+  | sort \
+  | tail -n1
+)
+
+curl -o "/${keyring}" "https://mirror.archlinux32.org/x86_64/releng/${keyring}"
+pacman -U --noconfirm "/${keyring}"
+rm "/${keyring}"
diff --git a/pacman-releng.conf b/pacman-releng.conf
new file mode 100644
index 0000000..94e970a
--- /dev/null
+++ b/pacman-releng.conf
@@ -0,0 +1,2 @@
+[releng]
+Include = /etc/pacman.d/mirrorlist
diff --git a/slave.Dockerfile b/slave.Dockerfile
index 2cdb622..e1eba96 100644
--- a/slave.Dockerfile
+++ b/slave.Dockerfile
@@ -3,14 +3,16 @@ FROM archlinux:base-devel
 WORKDIR /builder/
 
 RUN pacman-key --init
-RUN curl -Ss https://arch.eckner.net/README | sed 's@^Server = https:.*$@Include = /etc/pacman.d/mirrorlist \\@' | bash
-COPY mirrorlist /etc/pacman.d/
-RUN pacman -Syu --noconfirm git openssh
+RUN sed -i '/# The testing repositories are disabled by default/ i Include = /etc/pacman.d/pacman-releng.conf' /etc/pacman.conf
+COPY pacman-releng.conf mirrorlist /etc/pacman.d/
+COPY bootstrap-arch32-trust /
+RUN /bootstrap-arch32-trust
+RUN rm /bootstrap-arch32-trust
+RUN pacman -Syu --noconfirm git openssh lsof moreutils wget devtools32
 RUN sed -i ' \
   /PACKAGER/ s/.*/PACKAGER="Erich Eckner <arch at eckner dot net>"/; \
   /^OPTIONS/ s/ debug/ !debug/ \
 ' /etc/makepkg.conf
-
 RUN useradd -m builder
 RUN git clone https://git.archlinux32.org/builder/ /builder
 RUN mkdir /builder/work