Skip to content

Commit

Permalink
Merge #326
Browse files Browse the repository at this point in the history
326: Refactor Dockerfiles. r=therealprof a=reitermarkus

Common packages are now installed with `common.sh`.

Also fixes #330.

Co-authored-by: Markus Reiter <me@reitermark.us>
  • Loading branch information
bors[bot] and reitermarkus authored Oct 18, 2019
2 parents d38d0cf + 3e11c60 commit 4fb4fc1
Show file tree
Hide file tree
Showing 62 changed files with 288 additions and 877 deletions.
26 changes: 6 additions & 20 deletions docker/Dockerfile.aarch64-linux-android
Original file line number Diff line number Diff line change
@@ -1,34 +1,20 @@
FROM ubuntu:16.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY android-ndk.sh /
RUN bash /android-ndk.sh arm64 21
RUN /android-ndk.sh arm64 21
ENV PATH=$PATH:/android-ndk/bin

COPY android-system.sh /
RUN bash /android-system.sh arm64
RUN /android-system.sh arm64

COPY qemu.sh /
RUN bash /qemu.sh aarch64 android
RUN /qemu.sh aarch64 android

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

Expand Down
28 changes: 7 additions & 21 deletions docker/Dockerfile.aarch64-unknown-linux-gnu
Original file line number Diff line number Diff line change
@@ -1,41 +1,27 @@
FROM ubuntu:14.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY cmake.sh /
RUN apt-get purge --auto-remove -y cmake && \
bash /cmake.sh
/cmake.sh

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

COPY qemu.sh /
RUN bash /qemu.sh aarch64 linux softmmu
RUN /qemu.sh aarch64 linux softmmu

COPY dropbear.sh /
RUN bash /dropbear.sh
RUN /dropbear.sh

COPY linux-image.sh /
RUN bash /linux-image.sh aarch64
RUN /linux-image.sh aarch64

COPY linux-runner /

Expand Down
24 changes: 5 additions & 19 deletions docker/Dockerfile.aarch64-unknown-linux-musl
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
FROM ubuntu:18.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY qemu.sh /
RUN bash /qemu.sh aarch64
RUN /qemu.sh aarch64

COPY musl.sh /
RUN bash /musl.sh TARGET=aarch64-linux-musl
RUN /musl.sh TARGET=aarch64-linux-musl

# Allows qemu run dynamic linked binaries
RUN ln -sf \
Expand Down
26 changes: 6 additions & 20 deletions docker/Dockerfile.arm-linux-androideabi
Original file line number Diff line number Diff line change
@@ -1,34 +1,20 @@
FROM ubuntu:16.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY android-ndk.sh /
RUN bash /android-ndk.sh arm 21
RUN /android-ndk.sh arm 21
ENV PATH=$PATH:/android-ndk/bin

COPY android-system.sh /
RUN bash /android-system.sh arm
RUN /android-system.sh arm

COPY qemu.sh /
RUN bash /qemu.sh arm android
RUN /qemu.sh arm android

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

Expand Down
24 changes: 5 additions & 19 deletions docker/Dockerfile.arm-unknown-linux-gnueabi
Original file line number Diff line number Diff line change
@@ -1,34 +1,20 @@
FROM ubuntu:14.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY cmake.sh /
RUN apt-get purge --auto-remove -y cmake && \
bash /cmake.sh
/cmake.sh

COPY qemu.sh /
RUN apt-get install -y --no-install-recommends \
g++-arm-linux-gnueabi \
libc6-dev-armel-cross && \
bash /qemu.sh arm
/qemu.sh arm

ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER=arm-linux-gnueabi-gcc \
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER=qemu-arm \
Expand Down
24 changes: 5 additions & 19 deletions docker/Dockerfile.arm-unknown-linux-gnueabihf
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
FROM ubuntu:14.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY cmake.sh /
RUN apt-get purge --auto-remove -y cmake && \
bash /cmake.sh
/cmake.sh

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

COPY qemu.sh /

RUN bash /qemu.sh arm
RUN /qemu.sh arm

RUN apt-get install -y --no-install-recommends \
libc6-dev-armhf-cross
Expand Down
24 changes: 5 additions & 19 deletions docker/Dockerfile.arm-unknown-linux-musleabi
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
FROM ubuntu:18.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY qemu.sh /
RUN bash /qemu.sh arm
RUN /qemu.sh arm

COPY musl.sh /
RUN bash /musl.sh \
RUN /musl.sh \
TARGET=arm-linux-musleabi \
"COMMON_CONFIG += --with-arch=armv6 \
--with-float=soft \
Expand Down
24 changes: 5 additions & 19 deletions docker/Dockerfile.arm-unknown-linux-musleabihf
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
FROM ubuntu:18.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY qemu.sh /
RUN bash /qemu.sh arm
RUN /qemu.sh arm

COPY musl.sh /
RUN bash /musl.sh \
RUN /musl.sh \
TARGET=arm-linux-musleabihf \
"COMMON_CONFIG += --with-arch=armv6 \
--with-fpu=vfp \
Expand Down
24 changes: 5 additions & 19 deletions docker/Dockerfile.armv5te-unknown-linux-musleabi
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
FROM ubuntu:18.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY qemu.sh /
RUN bash /qemu.sh arm
RUN /qemu.sh arm

COPY musl.sh /
RUN bash /musl.sh \
RUN /musl.sh \
TARGET=arm-linux-musleabi \
"COMMON_CONFIG += --with-arch=armv5te \
--with-float=soft \
Expand Down
26 changes: 6 additions & 20 deletions docker/Dockerfile.armv7-linux-androideabi
Original file line number Diff line number Diff line change
@@ -1,34 +1,20 @@
FROM ubuntu:16.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
ca-certificates \
cmake \
gcc \
libc6-dev \
make \
pkg-config \
git \
automake \
libtool \
m4 \
autoconf \
make \
file \
binutils
COPY common.sh /
RUN /common.sh

COPY xargo.sh /
RUN bash /xargo.sh
RUN /xargo.sh

COPY android-ndk.sh /
RUN bash /android-ndk.sh arm 21
RUN /android-ndk.sh arm 21
ENV PATH=$PATH:/android-ndk/bin

COPY android-system.sh /
RUN bash /android-system.sh arm
RUN /android-system.sh arm

COPY qemu.sh /
RUN bash /qemu.sh arm android
RUN /qemu.sh arm android

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

Expand Down
Loading

0 comments on commit 4fb4fc1

Please sign in to comment.