From 67acf5e440e53f1996311b1dacd0cfe31e86d9ea Mon Sep 17 00:00:00 2001 From: Menci Date: Wed, 8 Dec 2021 02:34:48 +0800 Subject: [PATCH] Fix no mirrorlist in built image --- Dockerfile | 3 +++ files/mirrorlist-amd64 | 1 + files/mirrorlist-arm64 | 1 + files/repos-amd64 | 6 +++--- files/repos-arm64 | 10 +++++----- 5 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 files/mirrorlist-amd64 create mode 100644 files/mirrorlist-arm64 diff --git a/Dockerfile b/Dockerfile index 4c56154..afd8013 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,8 @@ COPY files /files RUN \ apk add arch-install-scripts pacman-makepkg curl && \ cat /files/repos-$TARGETARCH >> /etc/pacman.conf && \ + mkdir -p /etc/pacman.d && \ + cp /files/mirrorlist-$TARGETARCH /etc/pacman.d/mirrorlist && \ if [[ "$TARGETARCH" == "amd64" ]]; then \ apk add zstd && \ mkdir /tmp/archlinux-keyring && \ @@ -19,6 +21,7 @@ RUN \ pacman-key --populate && \ mkdir /rootfs && \ /files/pacstrap-docker /rootfs $PACKAGE_GROUP && \ + cp /etc/pacman.d/mirrorlist /rootfs/etc/pacman.d/mirrorlist && \ echo "en_US.UTF-8 UTF-8" > /rootfs/etc/locale.gen && \ echo "LANG=en_US.UTF-8" > /rootfs/etc/locale.conf && \ chroot /rootfs locale-gen && \ diff --git a/files/mirrorlist-amd64 b/files/mirrorlist-amd64 new file mode 100644 index 0000000..f2fbc08 --- /dev/null +++ b/files/mirrorlist-amd64 @@ -0,0 +1 @@ +Server = http://mirrors.xtom.com/archlinux/$repo/os/$arch diff --git a/files/mirrorlist-arm64 b/files/mirrorlist-arm64 new file mode 100644 index 0000000..135d2fe --- /dev/null +++ b/files/mirrorlist-arm64 @@ -0,0 +1 @@ +Server = http://mirror.archlinuxarm.org/$arch/$repo diff --git a/files/repos-amd64 b/files/repos-amd64 index 13ac9d5..99f7328 100644 --- a/files/repos-amd64 +++ b/files/repos-amd64 @@ -1,8 +1,8 @@ [core] -Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch +Include = /etc/pacman.d/mirrorlist [extra] -Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch +Include = /etc/pacman.d/mirrorlist [community] -Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch +Include = /etc/pacman.d/mirrorlist diff --git a/files/repos-arm64 b/files/repos-arm64 index f705a2e..c09cd9f 100644 --- a/files/repos-arm64 +++ b/files/repos-arm64 @@ -1,14 +1,14 @@ [core] -Server = http://mirror.archlinuxarm.org/$arch/$repo +Include = /etc/pacman.d/mirrorlist [extra] -Server = http://mirror.archlinuxarm.org/$arch/$repo +Include = /etc/pacman.d/mirrorlist [community] -Server = http://mirror.archlinuxarm.org/$arch/$repo +Include = /etc/pacman.d/mirrorlist [alarm] -Server = http://mirror.archlinuxarm.org/$arch/$repo +Include = /etc/pacman.d/mirrorlist [aur] -Server = http://mirror.archlinuxarm.org/$arch/$repo +Include = /etc/pacman.d/mirrorlist