Skip to content

Commit 39f1f13

Browse files
committed
Merge branch 'alteriso-3-mainline' into alteriso-3-stable
2 parents 48ff3a0 + a1d6767 commit 39f1f13

229 files changed

Lines changed: 5692 additions & 371 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
FROM archlinux:latest
22
RUN echo 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist \
33
&& echo 'nameserver 1.1.1.1' > /etc/resolv.conf
4+
RUN echo
45
RUN pacman -Syyu --noconfirm
56
RUN pacman -S archiso git arch-install-scripts sudo qt5-base cmake ninja base-devel --noconfirm
67
RUN pacman-key --init
78
COPY . /alterlinux
89
WORKDIR /alterlinux
9-
RUN git checkout dev
1010
RUN ./tools/keyring.sh -a
11-
CMD ["./build.sh", "-b"]
11+
ENTRYPOINT ["./build.sh"]
12+
CMD []

allarch.sh

Lines changed: 146 additions & 94 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)