Skip to content

Commit e78c7b6

Browse files
ci/Dockerfile: Reduce size of Docker image further
- No need to have wget installed - Clean up rm -rf /var/lib/apt/lists/, see https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get
1 parent 2f0d3bb commit e78c7b6

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

ci/linux-debian.Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN dpkg --add-architecture i386 && \
2222
# dkpg-dev: to make pkg-config work in cross-builds
2323
# llvm: for llvm-symbolizer, which is used by clang's UBSan for symbolized stack traces
2424
RUN apt-get update && apt-get install --no-install-recommends -y \
25-
git ca-certificates wget \
25+
git ca-certificates \
2626
make automake libtool pkg-config dpkg-dev valgrind qemu-user \
2727
gcc clang llvm libclang-rt-dev libc6-dbg \
2828
g++ \
@@ -37,7 +37,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
3737

3838
# Build and install gcc snapshot
3939
ARG GCC_SNAPSHOT_MAJOR=14
40-
RUN mkdir gcc && cd gcc && \
40+
RUN apt-get update && apt-get install --no-install-recommends -y wget libgmp-dev libmpfr-dev libmpc-dev flex && \
41+
mkdir gcc && cd gcc && \
4142
wget --progress=dot:giga --https-only --recursive --accept '*.tar.xz' --level 1 --no-directories "https://gcc.gnu.org/pub/gcc/snapshots/LATEST-${GCC_SNAPSHOT_MAJOR}" && \
4243
wget "https://gcc.gnu.org/pub/gcc/snapshots/LATEST-${GCC_SNAPSHOT_MAJOR}/sha512.sum" && \
4344
sha512sum --check --ignore-missing sha512.sum && \
@@ -46,14 +47,13 @@ RUN mkdir gcc && cd gcc && \
4647
[[ $(ls *.tar.xz | wc -l) -eq "1" ]] && \
4748
tar xf *.tar.xz && \
4849
mkdir gcc-build && cd gcc-build && \
49-
apt-get update && apt-get install --no-install-recommends -y libgmp-dev libmpfr-dev libmpc-dev flex && \
5050
../*/configure --prefix=/opt/gcc-snapshot --enable-languages=c --disable-bootstrap --disable-multilib --without-isl && \
5151
make -j $(nproc) && \
5252
make install && \
53-
apt-get autoremove -y libgmp-dev libmpfr-dev libmpc-dev flex && \
54-
apt-get clean && \
5553
cd ../.. && rm -rf gcc && \
56-
ln -s /opt/gcc-snapshot/bin/gcc /usr/bin/gcc-snapshot
54+
ln -s /opt/gcc-snapshot/bin/gcc /usr/bin/gcc-snapshot && \
55+
apt-get autoremove -y wget libgmp-dev libmpfr-dev libmpc-dev flex && \
56+
apt-get clean && rm -rf /var/lib/apt/lists/*
5757

5858
# Install clang snapshot, see https://apt.llvm.org/
5959
RUN \
@@ -71,5 +71,5 @@ RUN \
7171
ln -s "/usr/bin/clang-${LLVM_VERSION}" /usr/bin/clang-snapshot && \
7272
# Clean up
7373
apt-get autoremove -y wget && \
74-
apt-get clean
74+
apt-get clean && rm -rf /var/lib/apt/lists/*
7575

0 commit comments

Comments
 (0)