Skip to content

Commit 5b7495e

Browse files
tgross35tgross35
committed
ci: Commonize dockerfile style
Split all dependencies to new lines and sort them, and use consistent indentation across all files. (backport <#4795>) (cherry picked from commit 2e208d0)
1 parent 8631e5b commit 5b7495e

File tree

26 files changed

+247
-141
lines changed

26 files changed

+247
-141
lines changed

‎ci/docker/aarch64-linux-android/Dockerfile‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
FROM ubuntu:25.04
22

33
RUN dpkg --add-architecture i386
4-
RUN apt-get update
5-
RUN apt-get install -y --no-install-recommends libc6-dev gcc
6-
RUN apt-get install -y --no-install-recommends \
7-
file \
8-
wget \
9-
ca-certificates \
10-
python3 \
11-
unzip \
12-
expect \
13-
openjdk-8-jre \
14-
libstdc++6:i386 \
15-
libpulse0
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
5+
ca-certificates \
6+
expect \
7+
file \
8+
gcc \
9+
libc6-dev \
10+
libpulse0 \
11+
libstdc++6:i386 \
12+
openjdk-8-jre \
13+
python3 \
14+
unzip \
15+
wget
1616

1717
WORKDIR /android/
1818
COPY android* /android/
@@ -35,12 +35,12 @@ ENV PATH=$PATH:/rust/bin \
3535

3636
ADD runtest-android.rs /tmp/runtest.rs
3737
ENTRYPOINT [ \
38-
"bash", \
39-
"-c", \
40-
# set SHELL so android can detect a 64bits system, see
41-
# http://stackoverflow.com/a/41789144
42-
"SHELL=/bin/dash /android/sdk/emulator/emulator @aarch64 -no-window & \
43-
rustc /tmp/runtest.rs -o /tmp/runtest && \
44-
exec \"$@\"", \
45-
"--" \
38+
"bash", \
39+
"-c", \
40+
# set SHELL so android can detect a 64bits system, see
41+
# http://stackoverflow.com/a/41789144
42+
"SHELL=/bin/dash /android/sdk/emulator/emulator @aarch64 -no-window & \
43+
rustc /tmp/runtest.rs -o /tmp/runtest && \
44+
exec \"$@\"", \
45+
"--" \
4646
]

‎ci/docker/aarch64-unknown-linux-gnu/Dockerfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
FROM ubuntu:25.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
4-
gcc libc6-dev ca-certificates \
5-
gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user
4+
ca-certificates \
5+
gcc \
6+
gcc-aarch64-linux-gnu \
7+
libc6-dev \
8+
libc6-dev-arm64-cross \
9+
qemu-user
10+
611
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
712
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64 -L /usr/aarch64-linux-gnu" \
813
PATH=$PATH:/rust/bin

‎ci/docker/aarch64-unknown-linux-musl/Dockerfile‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
FROM ubuntu:25.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
4-
gcc make libc6-dev git curl ca-certificates \
5-
gcc-aarch64-linux-gnu qemu-user xz-utils patch rsync
4+
ca-certificates \
5+
curl \
6+
gcc \
7+
gcc-aarch64-linux-gnu \
8+
git \
9+
libc6-dev \
10+
make \
11+
patch \
12+
qemu-user \
13+
rsync \
14+
xz-utils
615

716
COPY install-musl.sh /
817
RUN /install-musl.sh aarch64

‎ci/docker/arm-linux-androideabi/Dockerfile‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
FROM ubuntu:25.04
22

33
RUN dpkg --add-architecture i386
4-
RUN apt-get update
5-
RUN apt-get install -y --no-install-recommends libc6-dev gcc
6-
RUN apt-get install -y --no-install-recommends \
7-
file \
8-
wget \
9-
ca-certificates \
10-
python3 \
11-
unzip \
12-
expect \
13-
openjdk-8-jre \
14-
libstdc++6:i386 \
15-
libpulse0
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
5+
ca-certificates \
6+
expect \
7+
file \
8+
gcc \
9+
libc6-dev \
10+
libpulse0 \
11+
libstdc++6:i386 \
12+
openjdk-8-jre \
13+
python3 \
14+
unzip \
15+
wget
1616

1717
WORKDIR /android/
1818
COPY android* /android/
@@ -35,12 +35,12 @@ ENV PATH=$PATH:/rust/bin \
3535

3636
ADD runtest-android.rs /tmp/runtest.rs
3737
ENTRYPOINT [ \
38-
"bash", \
39-
"-c", \
40-
# set SHELL so android can detect a 64bits system, see
41-
# http://stackoverflow.com/a/41789144
42-
"SHELL=/bin/dash /android/sdk/emulator/emulator @arm -no-window & \
43-
rustc /tmp/runtest.rs -o /tmp/runtest && \
44-
exec \"$@\"", \
45-
"--" \
38+
"bash", \
39+
"-c", \
40+
# set SHELL so android can detect a 64bits system, see
41+
# http://stackoverflow.com/a/41789144
42+
"SHELL=/bin/dash /android/sdk/emulator/emulator @arm -no-window & \
43+
rustc /tmp/runtest.rs -o /tmp/runtest && \
44+
exec \"$@\"", \
45+
"--" \
4646
]

‎ci/docker/arm-unknown-linux-gnueabihf/Dockerfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ FROM ubuntu:23.10
44
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
55
/etc/apt/sources.list && \
66
apt-get update && apt-get install -y --no-install-recommends \
7-
gcc libc6-dev ca-certificates \
8-
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user
7+
ca-certificates \
8+
gcc \
9+
gcc-arm-linux-gnueabihf \
10+
libc6-dev \
11+
libc6-dev-armhf-cross \
12+
qemu-user
13+
914
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
1015
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \
1116
PATH=$PATH:/rust/bin

‎ci/docker/arm-unknown-linux-musleabihf/Dockerfile‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@ FROM ubuntu:23.10
44
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
55
/etc/apt/sources.list && \
66
apt-get update && apt-get install -y --no-install-recommends \
7-
gcc make libc6-dev git curl ca-certificates \
8-
gcc-arm-linux-gnueabihf qemu-user xz-utils patch rsync
7+
ca-certificates \
8+
curl \
9+
gcc \
10+
gcc-arm-linux-gnueabihf \
11+
git \
12+
libc6-dev \
13+
make \
14+
patch \
15+
qemu-user \
16+
rsync \
17+
xz-utils
918

1019
COPY install-musl.sh /
1120
RUN /install-musl.sh arm

‎ci/docker/armv7-unknown-linux-uclibceabihf/Dockerfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,15 @@ FROM ubuntu:23.10
44
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
55
/etc/apt/sources.list && \
66
apt-get update && apt-get install -y --no-install-recommends \
7-
gcc libc6-dev qemu-user ca-certificates qemu-system-arm curl \
8-
xz-utils patch file
7+
ca-certificates \
8+
curl \
9+
file \
10+
gcc \
11+
libc6-dev \
12+
patch \
13+
qemu-system-arm \
14+
qemu-user \
15+
xz-utils
916

1017
RUN mkdir /toolchain
1118

‎ci/docker/asmjs-unknown-emscripten/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@ FROM ubuntu:25.04
44
ENV DEBIAN_FRONTEND=noninteractive
55
ENV TZ=America/New_York
66

7-
RUN apt-get update
8-
RUN apt-get install -y --no-install-recommends tzdata
9-
RUN apt-get install -y --no-install-recommends \
7+
RUN apt-get update && apt-get install -y --no-install-recommends \
8+
bzip2 \
109
ca-certificates \
1110
curl \
1211
gcc \
1312
git \
1413
libc6-dev \
1514
libxml2 \
1615
python3 \
17-
xz-utils \
18-
bzip2
16+
tzdata \
17+
xz-utils
1918

2019
COPY emscripten.sh /
2120
RUN /emscripten.sh

‎ci/docker/i686-linux-android/Dockerfile‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
FROM ubuntu:25.04
22

33
RUN dpkg --add-architecture i386
4-
RUN apt-get update
5-
RUN apt-get install -y --no-install-recommends libc6-dev gcc
6-
RUN apt-get install -y --no-install-recommends \
7-
file \
8-
wget \
9-
ca-certificates \
10-
python3 \
11-
unzip \
12-
expect \
13-
openjdk-8-jre \
14-
libstdc++6:i386 \
15-
libpulse0
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
5+
ca-certificates \
6+
expect \
7+
gcc \
8+
libc6-dev \
9+
libpulse0 \
10+
libstdc++6:i386 \
11+
openjdk-8-jre \
12+
python3 \
13+
unzip \
14+
wget \
15+
file
1616

1717
WORKDIR /android/
1818
COPY android* /android/
@@ -35,12 +35,12 @@ ENV PATH=$PATH:/rust/bin \
3535

3636
ADD runtest-android.rs /tmp/runtest.rs
3737
ENTRYPOINT [ \
38-
"bash", \
39-
"-c", \
40-
# set SHELL so android can detect a 64bits system, see
41-
# http://stackoverflow.com/a/41789144
42-
"SHELL=/bin/dash /android/sdk/emulator/emulator @i686 -no-window -no-accel & \
43-
rustc /tmp/runtest.rs -o /tmp/runtest && \
44-
exec \"$@\"", \
45-
"--" \
38+
"bash", \
39+
"-c", \
40+
# set SHELL so android can detect a 64bits system, see
41+
# http://stackoverflow.com/a/41789144
42+
"SHELL=/bin/dash /android/sdk/emulator/emulator @i686 -no-window -no-accel & \
43+
rustc /tmp/runtest.rs -o /tmp/runtest && \
44+
exec \"$@\"", \
45+
"--" \
4646
]

‎ci/docker/i686-unknown-linux-gnu/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
FROM ubuntu:23.10
22

3-
43
# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time
54
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
65
/etc/apt/sources.list && \
76
apt-get update && apt-get install -y --no-install-recommends \
8-
gcc-multilib libc6-dev ca-certificates
7+
ca-certificates \
8+
gcc-multilib \
9+
libc6-dev
910

1011
ENV PATH=$PATH:/rust/bin

0 commit comments

Comments
 (0)