diff --git a/build_scripts/Android/Dockerfile b/build_scripts/Android/Dockerfile index 6c986ce51..3d45bdf9a 100644 --- a/build_scripts/Android/Dockerfile +++ b/build_scripts/Android/Dockerfile @@ -27,12 +27,12 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get upgrade -y && apt-get clean -RUN apt-get install -y -qq \ +RUN apt-get install --no-install-recommends --assume-yes --quiet \ bash build-essential bzip2 cmake curl chrpath doxygen \ git p7zip python qt5-default qttools5-dev tclsh unzip wget zip # Dependencies to create Android pkg -RUN apt-get install -y -qq \ +RUN apt-get install --no-install-recommends --assume-yes --quiet \ openjdk-8-jre openjdk-8-jdk openjdk-8-jdk-headless gradle ARG FRESHCLONE=0 diff --git a/build_scripts/GitlabCI/Android.Dockerfile b/build_scripts/GitlabCI/Android.Dockerfile index a0844972d..88c73cd44 100644 --- a/build_scripts/GitlabCI/Android.Dockerfile +++ b/build_scripts/GitlabCI/Android.Dockerfile @@ -1,7 +1,7 @@ ARG ANDROID_NDK_ARCH=arm FROM registry.gitlab.com/retroshare/retroshare:android_${ANDROID_NDK_ARCH}_base -RUN apt-get update -y && apt-get upgrade -y +RUN apt-get update -y && apt-get upgrade --assume-yes --quiet --show-upgraded ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git ARG REPO_BRANCH=master