[xen master] automation: Rework archlinux container

[patchbot@xxxxxxx]

commit b84fdf521b306cce64388fe57ee6c7c00f9d3e76
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Tue Feb 28 18:16:49 2023 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Feb 28 18:54:52 2023 +0000

    automation: Rework archlinux container
    
    Base image "archlinux/base" isn't available anymore,
        
https://lists.archlinux.org/pipermail/arch-dev-public/2020-November/030181.html
    
    But instead of switching to archlinux/archlinux, we will use the
    official image from Docker. Main difference is that the first one is
    updated daily while the second is updated weekly.
    
    Also, as we will install the packages from "base-devel" anyway, switch
    to the "base-devel" tag.
    
    "dev86" package is now available from the main repo, no need for
    multilib repo anymore.
    
    It is recommended to initialise local signing key used by pacman, so
    let's do that.
    
    Replace "markdown" by "discount" as the former isn't available anymore
    and has been replaced by the later.
    
    Also, clean pacman's cache.
    
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 automation/build/archlinux/current.dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/automation/build/archlinux/current.dockerfile 
b/automation/build/archlinux/current.dockerfile
index d46fc9d9ca..13fb472d9e 100644
--- a/automation/build/archlinux/current.dockerfile
+++ b/automation/build/archlinux/current.dockerfile
@@ -1,16 +1,15 @@
-FROM archlinux/base
+FROM archlinux:base-devel
 LABEL maintainer.name="The Xen Project" \
       maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
 
-# Enable multilib repo, for dev86 package
-RUN echo $'[multilib]\nInclude = /etc/pacman.d/mirrorlist' >> /etc/pacman.conf
+RUN pacman-key --init
 
 RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \
-        base-devel \
         bin86 \
         bridge-utils \
         bzip2 \
         dev86 \
+        discount \
         dtc \
         e2fsprogs \
         ghostscript \
@@ -29,7 +28,6 @@ RUN pacman -S --refresh --sysupgrade --noconfirm 
--noprogressbar --needed \
         libnl \
         libpng \
         libseccomp \
-        markdown \
         net-tools \
         nss \
         perl \
@@ -46,7 +44,8 @@ RUN pacman -S --refresh --sysupgrade --noconfirm 
--noprogressbar --needed \
         wget \
         xz \
         yajl \
-        zlib
+        zlib \
+    && yes | pacman -S --clean --clean
 
 ENV 
PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl
 
--
generated by git-patchbot for /home/xen/git/xen.git#master