diff options
| author | Kunoi Sayami <[email protected]> | 2021-11-01 23:13:09 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-11-01 23:13:09 +0800 |
| commit | 9a3255c44047fcea27f6922639585aa5ddae32e6 (patch) | |
| tree | b1bff8073139f5a2643e4643ebb8fb7b7ed2ae0c /docker | |
| parent | 1e6b0bcbde4cc242269997065e8ddab26ca5dbc6 (diff) | |
feat(build): [REBUILD] Enhance AUR dependencies resolve way (#11)
* refactor(script): Change the way of retrieve aur dependencies and gpg key
* fix(docker): Fix docker not init pacman keys
* feat(build): Add a way to reduce rebuild workload
Signed-off-by: KunoiSayami <[email protected]>
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/dockerbuild.sh | 8 | ||||
| -rw-r--r-- | docker/dockerfile | 8 |
2 files changed, 15 insertions, 1 deletions
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..87fe5d1 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -1,6 +1,12 @@ 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-key --init + +RUN pacman --noconfirm --needed -Sy archlinuxcn-keyring + +RUN pacman --noconfirm --needed -Su base-devel gnupg git yay RUN useradd -m build |