Merge branch 'dev' into dev-stable

Author: Hayao0819

Dockerfile

@@ -1,12 +1,14 @@
 FROM archlinux:latest
-RUN echo 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist \
-&& echo 'nameserver 1.1.1.1' > /etc/resolv.conf
-RUN echo
-RUN pacman -Syyu --noconfirm
-RUN pacman -S archiso git arch-install-scripts sudo qt5-base cmake ninja base-devel --noconfirm
-RUN pacman-key --init
+RUN echo 'Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
+RUN pacman -Sy --noconfirm reflector
+RUN reflector --protocol https -c Japan --sort rate --save /etc/pacman.d/mirrorlist
+RUN pacman -Syyu --noconfirm \
+        git sudo python3 \
+        base-devel cmake ninja qt5-base \
+        archiso arch-install-scripts pyalpm
 COPY . /alterlinux
 WORKDIR /alterlinux
+RUN pacman-key --init
 RUN ./tools/keyring.sh -a
 ENTRYPOINT ["./build.sh"]
 CMD []

build.sh

@@ -1006,7 +1006,7 @@ make_prepare() {
         if [[ -d "${script_path}/.git" ]] && [[ "${gitversion}" = false ]]; then
             _version="${iso_version}-$(git rev-parse --short HEAD)"
         fi
-        "${tools_dir}/alteriso-info.sh" -a "${arch}" -b "${boot_splash}" -c "${channel_name%.add}" -d "${iso_publisher}" -k "${kernel}" -o "${os_name}" -p "${password}" -u "${username}" -v "${_version}"
+        "${tools_dir}/alteriso-info.sh" -a "${arch}" -b "${boot_splash}" -c "${channel_name%.add}" -d "${iso_publisher}" -k "${kernel}" -o "${os_name}" -p "${password}" -u "${username}" -v "${_version}" > "${_info_file}"
     fi
 }
 

docs/en/BUILD.md

@@ -26,7 +26,7 @@ sudo ./tools/keyring.sh --alter-add --arch32-add
 Install the packages required for build.
 
 ```bash
-sudo pacman -S --needed git make ninja arch-install-scripts squashfs-tools libisoburn dosfstools ninja cmake pyalpm
+sudo pacman -S --needed git make ninja arch-install-scripts squashfs-tools libisoburn dosfstools cmake pyalpm
 ```
 
 ### Use the TUI

docs/jp/BUILD.md

@@ -25,7 +25,7 @@ sudo ./tools/keyring.sh --alter-add --arch32-add
 ビルドに必要なパッケージをインストールします。
 
 ```bash
-sudo pacman -S --needed git make ninja arch-install-scripts squashfs-tools libisoburn dosfstools ninja cmake pyalpm
+sudo pacman -S --needed git make ninja arch-install-scripts squashfs-tools libisoburn dosfstools cmake pyalpm
 ```
 
 ### TUIを使用する