Refactor keyring setup in Dockerfile

Updated keyring installation commands and added gnupg to package installations.

Author: boredland

base.Dockerfile

@@ -15,27 +15,27 @@ ENV PATH="/usr/bin:${PATH}"
 
 RUN uname -m && \
     pacman-key --init && pacman-key --refresh-keys && \
-    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 && \
+    rm -r /etc/pacman.d/gnupg  && \
     pacman-mirrors --geoip
 
 RUN [[ "${TARGETPLATFORM}" == "linux/amd64" ]] || exit 0 && \
-    pacman -Syyu --noconfirm --needed archlinux-keyring manjaro-keyring && \
-    pacman-key --populate archlinux manjaro
+    pacman -Syyu --noconfirm --needed gnupg archlinux-keyring manjaro-keyring && \
+    pacman-key --init && \
+    pacman-key --populate archlinux manjaro && \
+    pacman-key --refresh-keys
 
 RUN [[ "${TARGETPLATFORM}" == "linux/arm64" ]] || exit 0 && \
-    pacman -Syyu --noconfirm --needed archlinuxarm-keyring manjaro-arm-keyring && \
-    pacman-key --populate archlinuxarm manjaro-arm
+    pacman -Syyu --noconfirm --needed gnupg archlinuxarm-keyring manjaro-arm-keyring && \
+    pacman-key --init && \
+    pacman-key --populate archlinuxarm manjaro-arm && \
+    pacman-key --refresh-keys
 
 # set everything to be a dependency
 RUN pacman -Qeq |  grep -q ^ && pacman -D --asdeps $(pacman -Qeq) || echo "nothing to set as dependency"
 
 # mark all base pkgs as explicitly installed
 RUN pacman -S --asexplicit --needed --noconfirm base
 
-
 # mark essentials as explicitly installed
 RUN pacman -S --asexplicit --needed --noconfirm \
     lsb-release \