diff --git a/README.md b/README.md index 6a13e8faf..5276bf7af 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ FROM rustembedded/cross:aarch64-unknown-linux-gnu-0.1.16 RUN dpkg --add-architecture arm64 && \ apt-get update && \ - apt-get install libfoo:arm64 + apt-get install --assume-yes libfoo:arm64 ``` ``` diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu index 7d031c440..27c1f170d 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-gnu +++ b/docker/Dockerfile.aarch64-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-aarch64-linux-gnu \ libc6-dev-arm64-cross diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabi b/docker/Dockerfile.arm-unknown-linux-gnueabi index f6d8fef9e..c57bf6fc1 100644 --- a/docker/Dockerfile.arm-unknown-linux-gnueabi +++ b/docker/Dockerfile.arm-unknown-linux-gnueabi @@ -10,7 +10,7 @@ COPY xargo.sh / RUN /xargo.sh COPY qemu.sh / -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-arm-linux-gnueabi \ libc6-dev-armel-cross && \ /qemu.sh arm diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf index 12a1ecb4d..4d96f69dc 100644 --- a/docker/Dockerfile.arm-unknown-linux-gnueabihf +++ b/docker/Dockerfile.arm-unknown-linux-gnueabihf @@ -10,7 +10,7 @@ COPY xargo.sh / RUN /xargo.sh RUN mkdir /usr/arm-linux-gnueabihf && \ - apt-get install -y --no-install-recommends curl xz-utils && \ + apt-get install --assume-yes --no-install-recommends curl xz-utils && \ cd /usr/arm-linux-gnueabihf && \ curl -L https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz | \ tar --strip-components 1 -xJ && \ diff --git a/docker/Dockerfile.armv5te-unknown-linux-gnueabi b/docker/Dockerfile.armv5te-unknown-linux-gnueabi index 59285ecf2..db629e17e 100644 --- a/docker/Dockerfile.armv5te-unknown-linux-gnueabi +++ b/docker/Dockerfile.armv5te-unknown-linux-gnueabi @@ -10,7 +10,7 @@ COPY xargo.sh / RUN /xargo.sh COPY qemu.sh / -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-arm-linux-gnueabi \ crossbuild-essential-armel \ libc6-dev-armel-cross && \ diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf index deb56affb..e641a552d 100644 --- a/docker/Dockerfile.armv7-unknown-linux-gnueabihf +++ b/docker/Dockerfile.armv7-unknown-linux-gnueabihf @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-arm-linux-gnueabihf \ libc6-dev-armhf-cross diff --git a/docker/Dockerfile.asmjs-unknown-emscripten b/docker/Dockerfile.asmjs-unknown-emscripten index 79cf71a4a..7a93aa3b7 100644 --- a/docker/Dockerfile.asmjs-unknown-emscripten +++ b/docker/Dockerfile.asmjs-unknown-emscripten @@ -23,7 +23,7 @@ ENV PATH="${EMSDK}:${EMSDK}/emscripten/sdk:${EMSDK}/llvm/clang/bin:${EMSDK}/node ENTRYPOINT ["/emsdk_portable/entrypoint"] -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ libxml2 \ python diff --git a/docker/Dockerfile.i586-unknown-linux-gnu b/docker/Dockerfile.i586-unknown-linux-gnu index 67db7de36..6a00d83e2 100644 --- a/docker/Dockerfile.i586-unknown-linux-gnu +++ b/docker/Dockerfile.i586-unknown-linux-gnu @@ -9,5 +9,5 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-multilib diff --git a/docker/Dockerfile.i686-unknown-linux-gnu b/docker/Dockerfile.i686-unknown-linux-gnu index 7ee1bd874..f76911341 100644 --- a/docker/Dockerfile.i686-unknown-linux-gnu +++ b/docker/Dockerfile.i686-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-multilib COPY qemu.sh / diff --git a/docker/Dockerfile.mips-unknown-linux-gnu b/docker/Dockerfile.mips-unknown-linux-gnu index b8e030e95..04ae0b024 100644 --- a/docker/Dockerfile.mips-unknown-linux-gnu +++ b/docker/Dockerfile.mips-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-mips-linux-gnu \ libc6-dev-mips-cross diff --git a/docker/Dockerfile.mips64-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64-unknown-linux-gnuabi64 index d329ebb35..d595b4e6b 100644 --- a/docker/Dockerfile.mips64-unknown-linux-gnuabi64 +++ b/docker/Dockerfile.mips64-unknown-linux-gnuabi64 @@ -10,7 +10,7 @@ COPY xargo.sh / RUN /xargo.sh COPY qemu.sh / -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-mips64-linux-gnuabi64 \ libc6-dev-mips64-cross && \ /qemu.sh mips64 diff --git a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 index 0cc4a36c6..f6e60e67d 100644 --- a/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 +++ b/docker/Dockerfile.mips64el-unknown-linux-gnuabi64 @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-mips64el-linux-gnuabi64 \ libc6-dev-mips64el-cross diff --git a/docker/Dockerfile.mipsel-unknown-linux-gnu b/docker/Dockerfile.mipsel-unknown-linux-gnu index 98882ee96..e3efef738 100644 --- a/docker/Dockerfile.mipsel-unknown-linux-gnu +++ b/docker/Dockerfile.mipsel-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-mipsel-linux-gnu \ libc6-dev-mipsel-cross diff --git a/docker/Dockerfile.powerpc-unknown-linux-gnu b/docker/Dockerfile.powerpc-unknown-linux-gnu index a14772e55..984d0119f 100644 --- a/docker/Dockerfile.powerpc-unknown-linux-gnu +++ b/docker/Dockerfile.powerpc-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-powerpc-linux-gnu \ libc6-dev-powerpc-cross diff --git a/docker/Dockerfile.powerpc64-unknown-linux-gnu b/docker/Dockerfile.powerpc64-unknown-linux-gnu index 8ca72e816..f6c9da519 100644 --- a/docker/Dockerfile.powerpc64-unknown-linux-gnu +++ b/docker/Dockerfile.powerpc64-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-powerpc64-linux-gnu \ libc6-dev-ppc64-cross diff --git a/docker/Dockerfile.powerpc64le-unknown-linux-gnu b/docker/Dockerfile.powerpc64le-unknown-linux-gnu index 4c8ef0a20..50e73063b 100644 --- a/docker/Dockerfile.powerpc64le-unknown-linux-gnu +++ b/docker/Dockerfile.powerpc64le-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-powerpc64le-linux-gnu \ libc6-dev-ppc64el-cross diff --git a/docker/Dockerfile.s390x-unknown-linux-gnu b/docker/Dockerfile.s390x-unknown-linux-gnu index 04405d002..0afeeca10 100644 --- a/docker/Dockerfile.s390x-unknown-linux-gnu +++ b/docker/Dockerfile.s390x-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-s390x-linux-gnu \ libc6-dev-s390x-cross diff --git a/docker/Dockerfile.sparc64-unknown-linux-gnu b/docker/Dockerfile.sparc64-unknown-linux-gnu index f423473ef..33fe9a755 100644 --- a/docker/Dockerfile.sparc64-unknown-linux-gnu +++ b/docker/Dockerfile.sparc64-unknown-linux-gnu @@ -9,7 +9,7 @@ RUN /cmake.sh COPY xargo.sh / RUN /xargo.sh -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ g++-sparc64-linux-gnu \ libc6-dev-sparc64-cross diff --git a/docker/Dockerfile.thumbv6m-none-eabi b/docker/Dockerfile.thumbv6m-none-eabi index 85da4a4ad..dd7b0b91b 100644 --- a/docker/Dockerfile.thumbv6m-none-eabi +++ b/docker/Dockerfile.thumbv6m-none-eabi @@ -10,7 +10,7 @@ COPY xargo.sh / RUN /xargo.sh COPY qemu.sh / -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ gcc-arm-none-eabi \ libnewlib-arm-none-eabi && \ /qemu.sh arm diff --git a/docker/Dockerfile.thumbv7em-none-eabi b/docker/Dockerfile.thumbv7em-none-eabi index 3cd744f44..d98b17d17 100644 --- a/docker/Dockerfile.thumbv7em-none-eabi +++ b/docker/Dockerfile.thumbv7em-none-eabi @@ -10,7 +10,7 @@ COPY xargo.sh / RUN /xargo.sh COPY qemu.sh / -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ gcc-arm-none-eabi \ libnewlib-arm-none-eabi && \ /qemu.sh arm diff --git a/docker/Dockerfile.thumbv7em-none-eabihf b/docker/Dockerfile.thumbv7em-none-eabihf index e3eec0335..495eb1974 100644 --- a/docker/Dockerfile.thumbv7em-none-eabihf +++ b/docker/Dockerfile.thumbv7em-none-eabihf @@ -10,7 +10,7 @@ COPY xargo.sh / RUN /xargo.sh COPY qemu.sh / -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ gcc-arm-none-eabi \ libnewlib-arm-none-eabi && \ /qemu.sh arm diff --git a/docker/Dockerfile.thumbv7m-none-eabi b/docker/Dockerfile.thumbv7m-none-eabi index bb92ad7a9..a9a1d43fa 100644 --- a/docker/Dockerfile.thumbv7m-none-eabi +++ b/docker/Dockerfile.thumbv7m-none-eabi @@ -10,7 +10,7 @@ COPY xargo.sh / RUN /xargo.sh COPY qemu.sh / -RUN apt-get install -y --no-install-recommends \ +RUN apt-get install --assume-yes --no-install-recommends \ gcc-arm-none-eabi \ libnewlib-arm-none-eabi && \ /qemu.sh arm diff --git a/docker/Dockerfile.wasm32-unknown-emscripten b/docker/Dockerfile.wasm32-unknown-emscripten index b7deb01b2..59425eae5 100644 --- a/docker/Dockerfile.wasm32-unknown-emscripten +++ b/docker/Dockerfile.wasm32-unknown-emscripten @@ -23,7 +23,7 @@ ENV PATH="${EMSDK}:${EMSDK}/emscripten/sdk:${EMSDK}/llvm/clang/bin:${EMSDK}/node ENTRYPOINT ["/emsdk_portable/entrypoint"] -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN apt-get update && apt-get install --assume-yes --no-install-recommends \ libxml2 \ python diff --git a/docker/Dockerfile.x86_64-pc-windows-gnu b/docker/Dockerfile.x86_64-pc-windows-gnu index 8c3eacf3a..18d8c0c6e 100644 --- a/docker/Dockerfile.x86_64-pc-windows-gnu +++ b/docker/Dockerfile.x86_64-pc-windows-gnu @@ -10,13 +10,13 @@ COPY xargo.sh / RUN /xargo.sh RUN dpkg --add-architecture i386 && apt-get update && \ - apt-get install -y --no-install-recommends \ + apt-get install --assume-yes --no-install-recommends \ wine-stable \ wine64 \ wine32 \ libz-mingw-w64-dev -RUN apt-get install -y --no-install-recommends g++-mingw-w64-x86-64 +RUN apt-get install --assume-yes --no-install-recommends g++-mingw-w64-x86-64 # run-detectors are responsible for calling the correct interpreter for exe # files. For some reason it does not work inside a docker container (it works diff --git a/docker/android-ndk.sh b/docker/android-ndk.sh index 526ce7555..7773ef183 100755 --- a/docker/android-ndk.sh +++ b/docker/android-ndk.sh @@ -19,7 +19,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/android-system.sh b/docker/android-system.sh index 6f747c3e2..68fdf46af 100755 --- a/docker/android-system.sh +++ b/docker/android-system.sh @@ -44,7 +44,7 @@ EOF local purge_list=(default-jre) for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/cmake.sh b/docker/cmake.sh index 83df5a19e..8aa097543 100755 --- a/docker/cmake.sh +++ b/docker/cmake.sh @@ -18,7 +18,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/common.sh b/docker/common.sh index 493957199..172e90baa 100755 --- a/docker/common.sh +++ b/docker/common.sh @@ -11,7 +11,7 @@ sed -i 's/http:\/\/\(.*\).ubuntu.com\/ubuntu\//[arch=amd64,i386] http:\/\/\1.arc apt-get update -apt-get install -y --no-install-recommends \ +apt-get install --assume-yes --no-install-recommends \ autoconf \ automake \ binutils \ diff --git a/docker/disabled/Dockerfile.i686-pc-windows-gnu b/docker/disabled/Dockerfile.i686-pc-windows-gnu index 67dca2e02..8d4c9827b 100644 --- a/docker/disabled/Dockerfile.i686-pc-windows-gnu +++ b/docker/disabled/Dockerfile.i686-pc-windows-gnu @@ -7,7 +7,7 @@ COPY xargo.sh / RUN /xargo.sh RUN dpkg --add-architecture i386 && apt-get update && \ - apt-get install -y --no-install-recommends \ + apt-get install --assume-yes --no-install-recommends \ wine-stable \ wine64 \ wine32 \ diff --git a/docker/disabled/dragonfly.sh b/docker/disabled/dragonfly.sh index 8d2b7e738..50ada5c8e 100755 --- a/docker/disabled/dragonfly.sh +++ b/docker/disabled/dragonfly.sh @@ -25,7 +25,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/dropbear.sh b/docker/dropbear.sh index 865273648..09a5743dc 100755 --- a/docker/dropbear.sh +++ b/docker/dropbear.sh @@ -20,7 +20,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/emscripten.sh b/docker/emscripten.sh index 5b89c9305..c014cf74e 100755 --- a/docker/emscripten.sh +++ b/docker/emscripten.sh @@ -16,7 +16,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/freebsd.sh b/docker/freebsd.sh index f711a3003..b35b8f046 100755 --- a/docker/freebsd.sh +++ b/docker/freebsd.sh @@ -24,7 +24,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/linux-image.sh b/docker/linux-image.sh index 5e8418bcb..a2e3479b0 100755 --- a/docker/linux-image.sh +++ b/docker/linux-image.sh @@ -97,7 +97,7 @@ main() { apt-get update for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/mingw.sh b/docker/mingw.sh index 15569c14d..6c0e544cb 100644 --- a/docker/mingw.sh +++ b/docker/mingw.sh @@ -9,7 +9,7 @@ main() { # Install mingw (with sjlj exceptions) to get the dependencies right # Later we replace these packages with the new ones - apt-get install -y --no-install-recommends g++-mingw-w64-i686 + apt-get install --assume-yes --no-install-recommends g++-mingw-w64-i686 local td=$(mktemp -d) @@ -22,7 +22,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep > /dev/null; then - apt-get install -y --no-install-recommends $dep + apt-get install --assume-yes --no-install-recommends $dep purge_list+=( $dep ) fi done diff --git a/docker/musl.sh b/docker/musl.sh index f900d9c85..878c896b0 100755 --- a/docker/musl.sh +++ b/docker/musl.sh @@ -30,7 +30,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/netbsd.sh b/docker/netbsd.sh index 31894626b..e75be9fe2 100755 --- a/docker/netbsd.sh +++ b/docker/netbsd.sh @@ -23,7 +23,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/qemu.sh b/docker/qemu.sh index 4beb452ca..4c0055c12 100755 --- a/docker/qemu.sh +++ b/docker/qemu.sh @@ -44,7 +44,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/solaris.sh b/docker/solaris.sh index 75afa5086..6b9a4320d 100755 --- a/docker/solaris.sh +++ b/docker/solaris.sh @@ -26,7 +26,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/docker/xargo.sh b/docker/xargo.sh index 6d631122a..98b2eded0 100755 --- a/docker/xargo.sh +++ b/docker/xargo.sh @@ -13,7 +13,7 @@ main() { local purge_list=() for dep in ${dependencies[@]}; do if ! dpkg -L $dep; then - apt-get install --no-install-recommends -y $dep + apt-get install --no-install-recommends --assume-yes $dep purge_list+=( $dep ) fi done diff --git a/src/docker.rs b/src/docker.rs index 84b99d2b7..d9ca3c60a 100644 --- a/src/docker.rs +++ b/src/docker.rs @@ -38,7 +38,7 @@ pub fn register(target: &Target, verbose: bool) -> Result<()> { "mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc && \ echo ':wine:M::MZ::/usr/bin/run-detectors:' > /proc/sys/fs/binfmt_misc/register" } else { - "apt-get update && apt-get install --no-install-recommends -y \ + "apt-get update && apt-get install --no-install-recommends --assume-yes \ binfmt-support qemu-user-static" };