From 73dd2af79f4695e658f56ad8e1fd1429e074238c Mon Sep 17 00:00:00 2001
From: KunoiSayami <i@leanhe.dev>
Date: Mon, 1 Nov 2021 22:30:19 +0800
Subject: refactor(script): Change the way of retrieve aur dependencies and gpg
 key

Signed-off-by: KunoiSayami <i@leanhe.dev>
---
 docker/dockerbuild.sh | 8 ++++++++
 docker/dockerfile     | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/dockerbuild.sh b/docker/dockerbuild.sh
index 5ae4880..ec933f5 100755
--- a/docker/dockerbuild.sh
+++ b/docker/dockerbuild.sh
@@ -5,16 +5,23 @@ set -Eeuo pipefail
 cd /home/build
 git clone --depth=3 https://github.com/kunoisayami/repos
 
+pushd repos
+git submodule update --init
+popd
+
 
 if [ $UID -eq 0 ]; then
     chown -R build:build repos
+
     echo "$TARGET_HOSTS" | base64 -d >> /etc/hosts
 else
+    echo -e "\n[archlinuxcn]\nServer = https://repo.archlinuxcn.org/$$arch\n" | sudo tee -a /etc/pacman.conf
     echo "$TARGET_HOSTS" | base64 -d | sudo tee -a /etc/hosts >/dev/null
 fi
 
 pushd repos
 if [ $UID -eq 0 ]; then
+
     su -c "echo $GPG_PRIV_KEY | base64 -d | gpg --import" build
 
     pushd repo/pod2man
@@ -24,6 +31,7 @@ if [ $UID -eq 0 ]; then
     su -c 'BUILD_ONLY="" ./pkgbuild.sh' build
 
     su -e -c './ci-upload.sh' build
+
 else
 
     echo $GPG_PRIV_KEY | base64 -d | gpg --import
diff --git a/docker/dockerfile b/docker/dockerfile
index 4ae53aa..f831a36 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -1,6 +1,10 @@
 FROM repobuildbase:latest
 
-RUN pacman --noconfirm --needed -Syu base-devel gnupg git
+RUN echo -e "\n[archlinuxcn]\nServer = https://repo.archlinuxcn.org/$$arch\n" >> /etc/pacman.conf
+
+RUN pacman --noconfirm --needed -Sy archlinuxcn-keyring
+
+RUN pacman --noconfirm --needed -Su base-devel gnupg git yay
 
 RUN useradd -m build
 
-- 
cgit v1.3.1