fix: improve pacman key handling in base.Dockerfile

Author: boredland

base.Dockerfile

@@ -15,28 +15,27 @@ ENV PATH="/usr/bin:${PATH}"
 
 RUN uname -m && \
     pacman-key --init && \
-    pacman-key --populate && \
+    pacman-key --populate archlinux manjaro && \
+    pacman-key --refresh-keys && \
+    pacman -Sy --noconfirm archlinux-keyring manjaro-keyring && \
+    pacman-key --populate archlinux manjaro && \
     pacman-key --refresh-keys && \
     pacman-mirrors --geoip && \
-
-RUN [[ "${TARGETPLATFORM}" == "linux/amd64" ]] || exit 0 && \
     pacman-key --recv-keys fh@manjaro.org && \
     pacman-key --lsign-key fh@manjaro.org && \
     pacman-key --recv-keys integral@archlinux.org && \
-    pacman-key --lsign-key integral@archlinux.org && \
+    pacman-key --lsign-key integral@archlinux.org
+
+RUN set +x
+
+RUN [[ "${TARGETPLATFORM}" == "linux/amd64" ]] || exit 0 && \
     pacman -Syyu --noconfirm --needed gnupg archlinux-keyring manjaro-keyring && \
-    rm -r /etc/pacman.d/gnupg && \
     pacman-key --init && \
     pacman-key --populate archlinux manjaro && \
     pacman-key --refresh-keys
 
 RUN [[ "${TARGETPLATFORM}" == "linux/arm64" ]] || exit 0 && \
-    pacman-key --recv-keys fh@manjaro.org && \
-    pacman-key --lsign-key fh@manjaro.org && \
-    pacman-key --recv-keys integral@archlinux.org && \
-    pacman-key --lsign-key integral@archlinux.org && \
     pacman -Syyu --noconfirm --needed gnupg archlinuxarm-keyring manjaro-arm-keyring && \
-    rm -r /etc/pacman.d/gnupg && \
     pacman-key --init && \
     pacman-key --populate archlinuxarm manjaro-arm && \
     pacman-key --refresh-keys
@@ -57,21 +56,20 @@ RUN pacman -S --asexplicit --needed --noconfirm \
 RUN pacman -Qtdq | grep -v base && pacman -Rsunc --noconfirm  $(pacman -Qtdq | grep -v base) systemd || echo "nothing to remove"
 
 # upgrade glibc
-RUN rm -f /usr/include/bits/struct_stat.h \
-       /usr/include/bits/types/struct___jmp_buf_tag.h \
-       /usr/include/bits/types/struct_timeb.h \
-       /usr/share/locale/sr/LC_MESSAGES/libc.mo && \
-    pacman-key --recv-keys fh@manjaro.org && \
-    pacman-key --lsign-key fh@manjaro.org && \
-    pacman-key --recv-keys integral@archlinux.org && \
-    pacman-key --lsign-key integral@archlinux.org && \
-    pacman -Q --info glibc && \
+RUN pacman -Q --info glibc && \
     pacman -Syy glibc --noconfirm && \
-    pacman -Q --info glibc && \
-    pacman -Syu --noconfirm
+    pacman -Q --info glibc
 
-# install some base pkgs for local-gen
-RUN pacman -Syy --noconfirm sed gzip
+# clean pacman cache
+RUN rm -f /var/cache/pacman/pkg/*
+
+RUN pacman -Sy --noconfirm archlinux-keyring manjaro-keyring && \
+    pacman-key --populate archlinux manjaro && \
+    pacman-key --refresh-keys && \
+    pacman -Fy --noconfirm && \
+    pacman -Syu --noconfirm && \
+    # install some base pkgs for local-gen
+    pacman -Syy --noconfirm sed gzip
 
 # enable at least one locale in locale.gen
 RUN sed -i 's/#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen && \