languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-09-15 22:50:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #105176 - klensy:docker-smol, r=Mark-Simulacrum

Browse source 
CI: reduce docker image sizes

Reduces docker image sizes by using simple tips like: cleaning packet managers cache, squashing sequential installation steps into one.

For some images this gives ~40mb for apt-based images (not so much), but ~200mb(!) for centos one.
This commit is contained in:
bors 2022-12-05 17:26:19 +00:00
parent 203c8765ea eadf69a6c6
commit e1d819583f
19 changed files with 43 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
View file

@ -14,7 +14,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
gdb \
libssl-dev \
pkg-config \
xz-utils
xz-utils \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

3
src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
View file

@ -32,7 +32,8 @@ RUN yum upgrade -y && \
wget \
xz \
zlib-devel.i686 \
zlib-devel.x86_64
zlib-devel.x86_64 \
&& yum clean all
RUN mkdir -p /rustroot/bin && ln -s /usr/bin/cmake3 /rustroot/bin/cmake

3
src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile
View file

@ -15,7 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
xz-utils \
wget \
libssl-dev \
pkg-config
pkg-config \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/freebsd-toolchain.sh /tmp/
RUN /tmp/freebsd-toolchain.sh x86_64

3
src/ci/docker/host-x86_64/dist-x86_64-illumos/Dockerfile
View file

@ -11,7 +11,8 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \
libgmp-dev \
libmpfr-dev \
libmpc-dev
libmpc-dev \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/illumos-toolchain.sh /tmp/

3
src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
View file

@ -32,7 +32,8 @@ RUN yum upgrade -y && \
wget \
xz \
zlib-devel.i686 \
zlib-devel.x86_64
zlib-devel.x86_64 \
&& yum clean all
RUN mkdir -p /rustroot/bin && ln -s /usr/bin/cmake3 /rustroot/bin/cmake

3
src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
View file

@ -16,7 +16,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
gdb \
patch \
libssl-dev \
pkg-config
pkg-config \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /build/

3
src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile
View file

@ -15,7 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
gdb \
zlib1g-dev \
lib32z1-dev \
xz-utils
xz-utils \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/

3
src/ci/docker/host-x86_64/i686-gnu/Dockerfile
View file

@ -15,7 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
gdb \
zlib1g-dev \
lib32z1-dev \
xz-utils
xz-utils \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/

8
src/ci/docker/host-x86_64/mingw-check/Dockerfile
View file

@ -20,20 +20,20 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
xz-utils \
libssl-dev \
pkg-config \
mingw-w64
mingw-w64 \
&& rm -rf /var/lib/apt/lists/*
RUN curl -sL https://nodejs.org/dist/v16.9.0/node-v16.9.0-linux-x64.tar.xz | tar -xJ
ENV PATH="/node-v16.9.0-linux-x64/bin:${PATH}"
# Install es-check
# Pin its version to prevent unrelated CI failures due to future es-check versions.
RUN npm install es-check@6.1.1 -g
RUN npm install eslint@8.6.0 -g
RUN npm install es-check@6.1.1 eslint@8.6.0 -g
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
COPY host-x86_64/mingw-check/reuse-requirements.txt /tmp/
RUN pip3 install --no-deps --require-hashes -r /tmp/reuse-requirements.txt
RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt
COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/

3
src/ci/docker/host-x86_64/test-various/Dockerfile
View file

@ -21,7 +21,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
ovmf \
qemu-efi-aarch64 \
qemu-system-arm \
qemu-system-x86
qemu-system-x86 \
&& rm -rf /var/lib/apt/lists/*
RUN curl -sL https://nodejs.org/dist/v15.14.0/node-v15.14.0-linux-x64.tar.xz | \
tar -xJ

3
src/ci/docker/host-x86_64/wasm32/Dockerfile
View file

@ -13,7 +13,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
sudo \
gdb \
xz-utils \
bzip2
bzip2 \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/emscripten.sh /scripts/
RUN bash /scripts/emscripten.sh

3
src/ci/docker/host-x86_64/x86_64-gnu-aux/Dockerfile
View file

@ -19,7 +19,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
llvm-dev \
libfreetype6-dev \
libexpat1-dev \
tidy
tidy \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

3
src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
View file

@ -23,7 +23,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pkg-config \
xz-utils \
lld \
clang
clang \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

3
src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile
View file

@ -15,7 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
gdb \
xz-utils \
libssl-dev \
pkg-config
pkg-config \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

3
src/ci/docker/host-x86_64/x86_64-gnu-llvm-13-stage1/Dockerfile
View file

@ -21,7 +21,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pkg-config \
zlib1g-dev \
xz-utils \
nodejs
nodejs \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

8
src/ci/docker/host-x86_64/x86_64-gnu-llvm-13/Dockerfile
View file

@ -24,15 +24,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
pkg-config \
zlib1g-dev \
xz-utils \
nodejs
nodejs \
# Install powershell so we can test x.ps1 on Linux
RUN apt-get update && \
apt-get install -y apt-transport-https software-properties-common && \
apt-transport-https software-properties-common && \
curl -s "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" > packages-microsoft-prod.deb && \
dpkg -i packages-microsoft-prod.deb && \
apt-get update && \
apt-get install -y powershell
apt-get install -y powershell \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

3
src/ci/docker/host-x86_64/x86_64-gnu-nopt/Dockerfile
View file

@ -15,7 +15,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
gdb \
libssl-dev \
pkg-config \
xz-utils
xz-utils \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

6
src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile
View file

@ -14,10 +14,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
sudo \
xz-utils \
tidy
tidy \
# Install dependencies for chromium browser
RUN apt-get install -y \
gconf-service \
libasound2 \
libatk1.0-0 \
@ -56,7 +55,8 @@ RUN apt-get install -y \
libnss3 \
lsb-release \
xdg-utils \
wget
wget \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

3
src/ci/docker/host-x86_64/x86_64-gnu/Dockerfile
View file

@ -15,7 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
gdb \
libssl-dev \
pkg-config \
xz-utils
xz-utils \
&& rm -rf /var/lib/apt/lists/*
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh