Merge branch 'dev' into dev-stable

[alterlinux/alterlinux.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index a0d8700..62264ac 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,14 @@
 FROM archlinux:latest
-RUN echo 'Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
-RUN pacman -Syyu --noconfirm
-RUN pacman -S git archiso arch-install-scripts sudo --noconfirm
-RUN git clone https://github.com/SereneTeam/alterlinux.git alterlinux/
+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 git checkout dev
-RUN ./keyring.sh -ca
-CMD ["./build.sh", "-b"]
+RUN pacman-key --init
+RUN ./tools/keyring.sh -a
+ENTRYPOINT ["./build.sh"]
+CMD []