Skip to content

Commit 4fb4fc1

Browse files
bors[bot]reitermarkus
bors[bot]
and
reitermarkus
authored
Merge #326
326: Refactor Dockerfiles. r=therealprof a=reitermarkus Common packages are now installed with `common.sh`. Also fixes #330. Co-authored-by: Markus Reiter <[email protected]>
2 parents d38d0cf + 3e11c60 commit 4fb4fc1

File tree

62 files changed

+288
-877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+288
-877
lines changed

‎docker/Dockerfile.aarch64-linux-android

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

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY android-ndk.sh /
24-
RUN bash /android-ndk.sh arm64 21
10+
RUN /android-ndk.sh arm64 21
2511
ENV PATH=$PATH:/android-ndk/bin
2612

2713
COPY android-system.sh /
28-
RUN bash /android-system.sh arm64
14+
RUN /android-system.sh arm64
2915

3016
COPY qemu.sh /
31-
RUN bash /qemu.sh aarch64 android
17+
RUN /qemu.sh aarch64 android
3218

3319
RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
3420

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

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,27 @@
11
FROM ubuntu:14.04
22

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY cmake.sh /
2410
RUN apt-get purge --auto-remove -y cmake && \
25-
bash /cmake.sh
11+
/cmake.sh
2612

2713
RUN apt-get install -y --no-install-recommends \
2814
g++-aarch64-linux-gnu \
2915
libc6-dev-arm64-cross
3016

3117
COPY qemu.sh /
32-
RUN bash /qemu.sh aarch64 linux softmmu
18+
RUN /qemu.sh aarch64 linux softmmu
3319

3420
COPY dropbear.sh /
35-
RUN bash /dropbear.sh
21+
RUN /dropbear.sh
3622

3723
COPY linux-image.sh /
38-
RUN bash /linux-image.sh aarch64
24+
RUN /linux-image.sh aarch64
3925

4026
COPY linux-runner /
4127

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

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
11
FROM ubuntu:18.04
22

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY qemu.sh /
24-
RUN bash /qemu.sh aarch64
10+
RUN /qemu.sh aarch64
2511

2612
COPY musl.sh /
27-
RUN bash /musl.sh TARGET=aarch64-linux-musl
13+
RUN /musl.sh TARGET=aarch64-linux-musl
2814

2915
# Allows qemu run dynamic linked binaries
3016
RUN ln -sf \

‎docker/Dockerfile.arm-linux-androideabi

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

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY android-ndk.sh /
24-
RUN bash /android-ndk.sh arm 21
10+
RUN /android-ndk.sh arm 21
2511
ENV PATH=$PATH:/android-ndk/bin
2612

2713
COPY android-system.sh /
28-
RUN bash /android-system.sh arm
14+
RUN /android-system.sh arm
2915

3016
COPY qemu.sh /
31-
RUN bash /qemu.sh arm android
17+
RUN /qemu.sh arm android
3218

3319
RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
3420

‎docker/Dockerfile.arm-unknown-linux-gnueabi

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,20 @@
11
FROM ubuntu:14.04
22

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY cmake.sh /
2410
RUN apt-get purge --auto-remove -y cmake && \
25-
bash /cmake.sh
11+
/cmake.sh
2612

2713
COPY qemu.sh /
2814
RUN apt-get install -y --no-install-recommends \
2915
g++-arm-linux-gnueabi \
3016
libc6-dev-armel-cross && \
31-
bash /qemu.sh arm
17+
/qemu.sh arm
3218

3319
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
3420
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=qemu-arm \

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

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
11
FROM ubuntu:14.04
22

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY cmake.sh /
2410
RUN apt-get purge --auto-remove -y cmake && \
25-
bash /cmake.sh
11+
/cmake.sh
2612

2713
RUN mkdir /usr/arm-linux-gnueabihf && \
2814
apt-get install -y --no-install-recommends curl xz-utils && \
@@ -35,7 +21,7 @@ ENV PATH /usr/arm-linux-gnueabihf/bin:$PATH
3521

3622
COPY qemu.sh /
3723

38-
RUN bash /qemu.sh arm
24+
RUN /qemu.sh arm
3925

4026
RUN apt-get install -y --no-install-recommends \
4127
libc6-dev-armhf-cross

‎docker/Dockerfile.arm-unknown-linux-musleabi

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
11
FROM ubuntu:18.04
22

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY qemu.sh /
24-
RUN bash /qemu.sh arm
10+
RUN /qemu.sh arm
2511

2612
COPY musl.sh /
27-
RUN bash /musl.sh \
13+
RUN /musl.sh \
2814
TARGET=arm-linux-musleabi \
2915
"COMMON_CONFIG += --with-arch=armv6 \
3016
--with-float=soft \

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

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
11
FROM ubuntu:18.04
22

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY qemu.sh /
24-
RUN bash /qemu.sh arm
10+
RUN /qemu.sh arm
2511

2612
COPY musl.sh /
27-
RUN bash /musl.sh \
13+
RUN /musl.sh \
2814
TARGET=arm-linux-musleabihf \
2915
"COMMON_CONFIG += --with-arch=armv6 \
3016
--with-fpu=vfp \

‎docker/Dockerfile.armv5te-unknown-linux-musleabi

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,16 @@
11
FROM ubuntu:18.04
22

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY qemu.sh /
24-
RUN bash /qemu.sh arm
10+
RUN /qemu.sh arm
2511

2612
COPY musl.sh /
27-
RUN bash /musl.sh \
13+
RUN /musl.sh \
2814
TARGET=arm-linux-musleabi \
2915
"COMMON_CONFIG += --with-arch=armv5te \
3016
--with-float=soft \

‎docker/Dockerfile.armv7-linux-androideabi

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

3-
RUN apt-get update && \
4-
apt-get install -y --no-install-recommends \
5-
ca-certificates \
6-
cmake \
7-
gcc \
8-
libc6-dev \
9-
make \
10-
pkg-config \
11-
git \
12-
automake \
13-
libtool \
14-
m4 \
15-
autoconf \
16-
make \
17-
file \
18-
binutils
3+
COPY common.sh /
4+
RUN /common.sh
195

206
COPY xargo.sh /
21-
RUN bash /xargo.sh
7+
RUN /xargo.sh
228

239
COPY android-ndk.sh /
24-
RUN bash /android-ndk.sh arm 21
10+
RUN /android-ndk.sh arm 21
2511
ENV PATH=$PATH:/android-ndk/bin
2612

2713
COPY android-system.sh /
28-
RUN bash /android-system.sh arm
14+
RUN /android-system.sh arm
2915

3016
COPY qemu.sh /
31-
RUN bash /qemu.sh arm android
17+
RUN /qemu.sh arm android
3218

3319
RUN cp /android-ndk/sysroot/usr/lib/libz.so /system/lib/
3420

0 commit comments

Comments
 (0)