added more layers to arch builder image
All checks were successful
CI / Build arch-builder docker images (push) Successful in 8m25s

This commit is contained in:
2024-07-29 21:30:41 +08:00
parent 9634e2b478
commit b33cef32bc
2 changed files with 72 additions and 25 deletions

View File

@@ -32,11 +32,24 @@ RUN rm -rf downloads
COPY makepkg/* /etc/
RUN useradd luser -G users -u 1000 -s /bin/bash -m -d /home/luser
RUN pacman -S --noconfirm --needed \
git \
cmake \
base-devel \
meson \
tar \
xz \
ccache \
lzop \
lz4 \
bzip2 \
gzip \
upx
FROM base AS kernel
RUN pacman -S --noconfirm --needed \
bc \
cpio \
gettext \
@@ -47,33 +60,30 @@ RUN pacman -S --noconfirm --needed \
python-pip \
python-build \
python-wheel \
maven \
tar \
xz \
llvm \
graphviz \
imagemagick \
python-sphinx \
python-yaml \
openssh \
texlive-latexextra \
ccache \
lzop \
lz4 \
bzip2 \
gzip \
upx \
docker \
clang \
hidapi \
protobuf \
jdk21-openjdk
texlive-latexextra
FROM base as rootless
RUN useradd luser -G users -u 1000 -s /bin/bash -m -d /home/luser
FROM base AS rust
RUN mkdir -p /etc/cargo
COPY config.toml /etc/cargo/
RUN pacman -S --noconfirm --needed \
rustup \
llvm \
clang
FROM rust AS rust-full
RUN pacman -S --noconfirm --needed \
hidapi \
protobuf
FROM rust-full AS rust-full-rootless
USER luser
WORKDIR /home/luser
RUN mkdir .cargo
RUN ln -s /etc/cargo/config.toml .cargo/config.toml
RUN rustup toolchain install stable-x86_64-unknown-linux-gnu
RUN rustup target add \
x86_64-unknown-linux-musl \
@@ -83,7 +93,5 @@ RUN rustup target add \
arm-unknown-linux-musleabi \
aarch64-unknown-linux-musl \
aarch64-unknown-linux-gnu
RUN mkdir .cargo
COPY config.toml .cargo/