Skip to content

Commit b2292de

Browse files
committed
Dockerfile: make llvm installation smaller
1 parent d4dfae6 commit b2292de

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -337,20 +337,20 @@ RUN --mount=type=cache,target=/root/.cache/pip \
337337

338338
# Update and install prerequisites
339339
RUN apt-get update && apt-get install -y \
340-
wget \
340+
curl \
341341
gnupg \
342+
ca-certificates \
342343
software-properties-common \
343344
&& rm -rf /var/lib/apt/lists/*
344345

345-
# Add the LLVM repository
346-
RUN wget https://apt.llvm.org/llvm.sh && \
347-
chmod +x llvm.sh && \
348-
./llvm.sh 20
346+
# Add the LLVM repository (proper key import + HTTPS)
347+
RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-snapshot.gpg && \
348+
echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] https://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" > /etc/apt/sources.list.d/llvm-toolchain-jammy-20.list
349349

350350
# Install apt dependencies - first line for penguin - second for fw2tar
351351
RUN apt-get update && apt-get install -q -y \
352-
fakeroot genext2fs graphviz graphviz-dev libarchive13 libgcc-s1 liblinear4 liblua5.3-0 libpcap0.8 libpcre3 libssh2-1 libssl3 libstdc++6 libxml2 lua-lpeg nmap python3 python3-lxml python3-venv sudo telnet vim wget zlib1g pigz clang-20 lldb-20 lld-20 \
353-
android-sdk-libsparse-utils arj automake build-essential bzip2 cabextract clang cpio cramfsswap curl default-jdk e2fsprogs fakeroot gcc git gzip lhasa libarchive-dev libfontconfig1-dev libacl1-dev libcap-dev liblzma-dev liblzo2-dev liblz4-dev libbz2-dev libssl-dev libmagic1 locales lz4 lziprecover lzop mtd-utils openssh-client p7zip p7zip-full python3 python3-pip qtbase5-dev sleuthkit squashfs-tools srecord tar unar unrar unrar-free unyaffs unzip wget xz-utils zlib1g-dev zstd && \
352+
fakeroot genext2fs graphviz graphviz-dev libarchive13 libgcc-s1 liblinear4 liblua5.3-0 libpcap0.8 libpcre3 libssh2-1 libssl3 libstdc++6 libxml2 lua-lpeg nmap python3 python3-lxml python3-venv sudo telnet vim wget zlib1g pigz clang-20 lld-20 \
353+
android-sdk-libsparse-utils arj automake build-essential bzip2 cabextract cpio cramfsswap curl default-jdk e2fsprogs fakeroot gcc git gzip lhasa libarchive-dev libfontconfig1-dev libacl1-dev libcap-dev liblzma-dev liblzo2-dev liblz4-dev libbz2-dev libssl-dev libmagic1 locales lz4 lziprecover lzop mtd-utils openssh-client p7zip p7zip-full python3 python3-pip qtbase5-dev sleuthkit squashfs-tools srecord tar unar unrar unrar-free unyaffs unzip xz-utils zlib1g-dev zstd && \
354354
apt install -yy -f /tmp/pandare.deb -f /tmp/pandare-plugins.deb \
355355
-f /tmp/glow.deb -f /tmp/gum.deb -f /tmp/ripgrep.deb && \
356356
rm -rf /var/lib/apt/lists/* /tmp/*.deb
@@ -370,7 +370,7 @@ COPY --from=python_builder /app/wheels /wheels
370370
# Remove python_lzo 1.0 to resolve depdency collision with vmlinux-to-elf
371371
RUN rm -rf /wheels/python_lzo*
372372

373-
RUN pip install --no-cache /wheels/*
373+
RUN pip install --no-cache /wheels/* && rm -rf /wheels
374374

375375
RUN poetry config virtualenvs.create false
376376

0 commit comments

Comments
 (0)