Fix Dockerでのビルドに対応&Dockerでのビルド前に'git pullを'するように仕様変更

diff --git a/Dockerfile b/Dockerfile
index aad47ba..3e4432b 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 FROM archlinux:latest
-RUN curl -o /etc/pacman.d/mirrorlist https://www.archlinux.org/mirrorlist/?country=all&protocol=http&protocol=https&ip_version=4
-RUN sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
+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 pacman -Syyu --noconfirm
-RUN pacman -S git archiso arch-install-scripts sudo qt5-base cmake ninja base-devel --noconfirm
-RUN git clone https://github.com/SereneTeam/alterlinux.git alterlinux/
+RUN pacman -S archiso git arch-install-scripts sudo qt5-base cmake ninja base-devel --noconfirm
+RUN git clone https://github.com/FascodeNet/alterlinux.git alterlinux/
 WORKDIR /alterlinux
 RUN git checkout dev
 RUN ./keyring.sh -ca

diff --git a/build.sh b/build.sh
index beeea5a..fb82a8b 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -433,6 +433,8 @@ remove_work() {
 
 # Preparation for build
 prepare_build() {
+    # Run 'git pull' when building on docker.
+    [[ "${DOCKER}" == true ]] && git pull origin && _msg_info "pulling AlterLinux repository..."
     # Create a working directory.
     [[ ! -d "${work_dir}" ]] && mkdir -p "${work_dir}"
 

diff --git a/docker-build.sh b/docker-build.sh
index 85de9ab..53f09d1 100755 (executable)
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -14,4 +14,4 @@ fi
 SCRIPT_DIR=$(cd $(dirname $0); pwd)
 cd $SCRIPT_DIR
 docker build -t alterlinux-build:latest .
-docker run -t -i --privileged -v $SCRIPT_DIR/out:/alterlinux/out alterlinux-build
+docker run -e _DOCKER=true -t -i --privileged -v $SCRIPT_DIR/out:/alterlinux/out -v /usr/lib/modules:/usr/lib/modules:ro alterlinux-build