revert dockerfile changes

Author: garasubo

docker/Dockerfile.aarch64-unknown-linux-gnu

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-gnu-
-ENV CROSS_SYSROOT=/usr/aarch64-linux-gnu
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=arm64 TARGET_TRIPLE=aarch64-linux-gnu /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-aarch64-linux-gnu \
+    gfortran-aarch64-linux-gnu \
+    libc6-dev-arm64-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=arm64 /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh aarch64
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-gnu-
+ENV CROSS_SYSROOT=/usr/aarch64-linux-gnu
 ENV CROSS_TARGET_RUNNER="/linux-runner aarch64"
 ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.arm-unknown-linux-gnueabi

@@ -10,13 +10,12 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
-FROM cross-base AS build
+FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
-ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=armel TARGET_TRIPLE=arm-linux-gnueabi /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-arm-linux-gnueabi \
+    gfortran-arm-linux-gnueabi \
+    libc6-dev-armel-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=armel /deny-debian-packages.sh \
@@ -29,6 +28,8 @@ RUN /qemu.sh arm
 COPY qemu-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
+ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
 ENV CROSS_TARGET_RUNNER="/qemu-runner arm"
 ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABI_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.armv5te-unknown-linux-gnueabi

@@ -12,11 +12,11 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
-ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=armel TARGET_TRIPLE=arm-linux-gnueabi CROSSBUILD_ESSENTIAL=1 /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-arm-linux-gnueabi \
+    gfortran-arm-linux-gnueabi \
+    crossbuild-essential-armel \
+    libc6-dev-armel-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=armel /deny-debian-packages.sh \
@@ -29,6 +29,8 @@ RUN /qemu.sh arm
 COPY qemu-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
+ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
 ENV CROSS_TARGET_RUNNER="/qemu-runner arm"
 ENV CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_GNUEABI_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_ARMV5TE_UNKNOWN_LINUX_GNUEABI_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.armv7-unknown-linux-gnueabi

@@ -12,18 +12,19 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
-ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=armel TARGET_TRIPLE=arm-linux-gnueabi /apt-cross-essential.sh
+RUN apt-get install --assume-yes --no-install-recommends \
+    g++-arm-linux-gnueabi \
+    gfortran-arm-linux-gnueabi \
+    libc6-dev-armel-cross
 
 COPY qemu.sh /
 RUN /qemu.sh arm
 
 COPY qemu-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabi-
+ENV CROSS_SYSROOT=/usr/arm-linux-gnueabi
 ENV CROSS_TARGET_RUNNER="/qemu-runner armv7"
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABI_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABI_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.armv7-unknown-linux-gnueabihf

@@ -10,13 +10,12 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
-FROM cross-base AS build
+FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabihf-
-ENV CROSS_SYSROOT=/usr/arm-linux-gnueabihf
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=armhf TARGET_TRIPLE=arm-linux-gnueabihf /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-arm-linux-gnueabihf \
+    gfortran-arm-linux-gnueabihf \
+    libc6-dev-armhf-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=armhf /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh armv7
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-gnueabihf-
+ENV CROSS_SYSROOT=/usr/arm-linux-gnueabihf
 ENV CROSS_TARGET_RUNNER="/linux-runner armv7hf"
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.i586-unknown-linux-gnu

@@ -12,8 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=i386 TARGET_TRIPLE=i686-linux-gnu /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-i686-linux-gnu \
+    gfortran-i686-linux-gnu \
+    libc6-dev-i386-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=i386 /deny-debian-packages.sh \

docker/Dockerfile.i686-unknown-linux-gnu

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=i686-linux-gnu-
-ENV CROSS_SYSROOT=/usr/i686-linux-gnu
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=i386 TARGET_TRIPLE=i686-linux-gnu /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-i686-linux-gnu \
+    gfortran-i686-linux-gnu \
+    libc6-dev-i386-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=i386 /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh i686
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=i686-linux-gnu-
+ENV CROSS_SYSROOT=/usr/i686-linux-gnu
 ENV CROSS_TARGET_RUNNER="/linux-runner i686"
 ENV CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.mips-unknown-linux-gnu

@@ -12,18 +12,19 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=mips-linux-gnu-
-ENV CROSS_SYSROOT=/usr/mips-linux-gnu
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=mips TARGET_TRIPLE=mips-linux-gnu /apt-cross-essential.sh
+RUN apt-get install --assume-yes --no-install-recommends \
+    g++-mips-linux-gnu \
+    gfortran-mips-linux-gnu \
+    libc6-dev-mips-cross
 
 COPY qemu.sh /
 RUN /qemu.sh mips
 
 COPY qemu-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=mips-linux-gnu-
+ENV CROSS_SYSROOT=/usr/mips-linux-gnu
 ENV CROSS_TARGET_RUNNER="/qemu-runner mips"
 ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_MIPS_UNKNOWN_LINUX_GNU_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.mips64-unknown-linux-gnuabi64

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=mips64-linux-gnuabi64-
-ENV CROSS_SYSROOT=/usr/mips64-linux-gnuabi64
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=mips64 TARGET_TRIPLE=mips64-linux-gnuabi64 /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-mips64-linux-gnuabi64 \
+    gfortran-mips64-linux-gnuabi64 \
+    libc6-dev-mips64-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=mips64 /deny-debian-packages.sh \
@@ -29,6 +28,8 @@ RUN /qemu.sh mips64
 COPY qemu-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=mips64-linux-gnuabi64-
+ENV CROSS_SYSROOT=/usr/mips64-linux-gnuabi64
 ENV CROSS_TARGET_RUNNER="/qemu-runner mips64"
 ENV CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_MIPS64_UNKNOWN_LINUX_GNUABI64_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.mips64el-unknown-linux-gnuabi64

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=mips64el-linux-gnuabi64-
-ENV CROSS_SYSROOT=/usr/mips64el-linux-gnuabi64
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=mips64el TARGET_TRIPLE=mips64el-linux-gnuabi64 /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-mips64el-linux-gnuabi64 \
+    gfortran-mips64el-linux-gnuabi64 \
+    libc6-dev-mips64el-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=mips64el /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh mips64el
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=mips64el-linux-gnuabi64-
+ENV CROSS_SYSROOT=/usr/mips64el-linux-gnuabi64
 ENV CROSS_TARGET_RUNNER="/linux-runner mips64el"
 ENV CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_MIPS64EL_UNKNOWN_LINUX_GNUABI64_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.mipsel-unknown-linux-gnu

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=mipsel-linux-gnu-
-ENV CROSS_SYSROOT=/usr/mipsel-linux-gnu
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=mipsel TARGET_TRIPLE=mipsel-linux-gnu /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-mipsel-linux-gnu \
+    gfortran-mipsel-linux-gnu \
+    libc6-dev-mipsel-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=mipsel /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh mipsel
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=mipsel-linux-gnu-
+ENV CROSS_SYSROOT=/usr/mipsel-linux-gnu
 ENV CROSS_TARGET_RUNNER="/linux-runner mipsel"
 ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_GNU_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.powerpc-unknown-linux-gnu

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=powerpc-linux-gnu-
-ENV CROSS_SYSROOT=/usr/powerpc-linux-gnu
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=powerpc TARGET_TRIPLE=powerpc-linux-gnu /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-powerpc-linux-gnu \
+    gfortran-powerpc-linux-gnu \
+    libc6-dev-powerpc-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=powerpc /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh powerpc
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=powerpc-linux-gnu-
+ENV CROSS_SYSROOT=/usr/powerpc-linux-gnu
 ENV CROSS_TARGET_RUNNER="/linux-runner powerpc"
 ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_POWERPC_UNKNOWN_LINUX_GNU_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.powerpc64-unknown-linux-gnu

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=powerpc64-linux-gnu-
-ENV CROSS_SYSROOT=/usr/powerpc64-linux-gnu
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=ppc64 TARGET_TRIPLE=powerpc64-linux-gnu /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-powerpc64-linux-gnu \
+    gfortran-powerpc64-linux-gnu \
+    libc6-dev-ppc64-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=ppc64 /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh powerpc64
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=powerpc64-linux-gnu-
+ENV CROSS_SYSROOT=/usr/powerpc64-linux-gnu
 ENV CROSS_TARGET_RUNNER="/linux-runner powerpc64"
 ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.powerpc64le-unknown-linux-gnu

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=powerpc64le-linux-gnu-
-ENV CROSS_SYSROOT=/usr/powerpc64le-linux-gnu
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=ppc64el TARGET_TRIPLE=powerpc64le-linux-gnu /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-powerpc64le-linux-gnu \
+    gfortran-powerpc64le-linux-gnu \
+    libc6-dev-ppc64el-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=ppc64el /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh powerpc64le
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=powerpc64le-linux-gnu-
+ENV CROSS_SYSROOT=/usr/powerpc64le-linux-gnu
 ENV CROSS_TARGET_RUNNER="/linux-runner powerpc64le"
 ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_GNU_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.riscv64gc-unknown-linux-gnu

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=riscv64-linux-gnu-
-ENV CROSS_SYSROOT=/usr/riscv64-linux-gnu
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=riscv64 TARGET_TRIPLE=riscv64-linux-gnu /apt-cross-essential.sh
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    g++-riscv64-linux-gnu \
+    gfortran-riscv64-linux-gnu \
+    libc6-dev-riscv64-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=riscv64 /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh riscv64
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=riscv64-linux-gnu-
+ENV CROSS_SYSROOT=/usr/riscv64-linux-gnu
 ENV CROSS_TARGET_RUNNER="/linux-runner riscv64"
 ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_RUNNER="$CROSS_TARGET_RUNNER" \

docker/Dockerfile.s390x-unknown-linux-gnu

@@ -12,11 +12,10 @@ RUN /xargo.sh
 
 FROM cross-base as build
 
-ENV CROSS_TOOLCHAIN_PREFIX=s390x-linux-gnu-
-ENV CROSS_SYSROOT=/usr/s390x-linux-gnu
-
-COPY apt-cross-essential.sh /
-RUN TARGET_ARCH=s390x TARGET_TRIPLE=s390x-linux-gnu /apt-cross-essential.sh
+RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
+    g++-s390x-linux-gnu \
+    gfortran-s390x-linux-gnu \
+    libc6-dev-s390x-cross
 
 COPY deny-debian-packages.sh /
 RUN TARGET_ARCH=s390x /deny-debian-packages.sh \
@@ -35,6 +34,8 @@ RUN /linux-image.sh s390x
 COPY linux-runner base-runner.sh /
 COPY toolchain.cmake /opt/toolchain.cmake
 
+ENV CROSS_TOOLCHAIN_PREFIX=s390x-linux-gnu-
+ENV CROSS_SYSROOT=/usr/s390x-linux-gnu
 ENV CROSS_TARGET_RUNNER="/linux-runner s390x"
 ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="$CROSS_TARGET_RUNNER" \